fix 营业点查询和负数处理
This commit is contained in:
@@ -11,8 +11,14 @@ public class ShiftAndBusinessPlaceAnalysisResponse
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 消费总金额
|
/// 消费总金额
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal Amount { get; set; }
|
[JsonIgnore]
|
||||||
|
public decimal CurrentAmount { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消费总金额
|
||||||
|
/// </summary>
|
||||||
|
public string Amount => Math.Abs(CurrentAmount).ToString("F2");
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 消费人数
|
/// 消费人数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ public class BalanceSummaryService : IBalanceSummaryService
|
|||||||
|
|
||||||
return new ShiftAndBusinessPlaceAnalysisResponse
|
return new ShiftAndBusinessPlaceAnalysisResponse
|
||||||
{
|
{
|
||||||
Amount = data?.Amount ?? 0,
|
CurrentAmount = data?.Amount ?? 0,
|
||||||
UserCount = data?.UserCount ?? 0,
|
UserCount = data?.UserCount ?? 0,
|
||||||
CostCount = data?.CostCount ?? 0,
|
CostCount = data?.CostCount ?? 0,
|
||||||
Pagination = page,
|
Pagination = page,
|
||||||
@@ -211,6 +211,7 @@ public class BalanceSummaryService : IBalanceSummaryService
|
|||||||
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
|
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
|
||||||
.WhereIF(internalRequest.Search.IsPresent(), (record, bPlace) => bPlace.Name.Contains(internalRequest.Search))
|
.WhereIF(internalRequest.Search.IsPresent(), (record, bPlace) => bPlace.Name.Contains(internalRequest.Search))
|
||||||
.Where(record => record.BusinessPlaceCode.HasValue)
|
.Where(record => record.BusinessPlaceCode.HasValue)
|
||||||
|
.WhereIF(internalRequest.BusinessplaceCodes.IsPresent(), record => internalRequest.BusinessplaceCodes.Contains(record.BusinessPlaceCode.Value))
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user