1、优化零售明细相关支付金额不能为负值的缺陷,根据实际情况展示;

2、优化门店销售对比,时间改成审核时间;避免跨月订单统计不准确;
This commit is contained in:
chenlin 2025-07-01 11:57:23 +08:00
parent dc66375898
commit 54a6fc2551
2 changed files with 6 additions and 6 deletions

View File

@ -3008,9 +3008,9 @@ func QueryStoreSalesData(req *ErpStoreSalesDataReq, c *gin.Context) (*ErpStoreSa
logger.Error("endTime parse err")
}
qs = qs.Where("maker_time BETWEEN ? AND ?", startTime, endTime)
qs = qs.Where("audit_time BETWEEN ? AND ?", startTime, endTime)
} else {
qs = qs.Where("maker_time IS NOT NULL")
qs = qs.Where("audit_time IS NOT NULL")
}
qs.Where("state = ?", ErpOrderStateAudited)

View File

@ -5843,10 +5843,10 @@ func subtractCashierData(cashierData, rejectedCashierData []ErpOrderCashier) []E
var result []ErpOrderCashier
for _, cashier := range cashierData {
adjustedAmount := cashier.Amount - rejectedMap[cashier.CashierId]
// 如果金额为负数则视为零
if adjustedAmount < 0 {
adjustedAmount = 0
}
//// 如果金额为负数则视为零
//if adjustedAmount < 0 {
// adjustedAmount = 0
//}
result = append(result, ErpOrderCashier{
CashierId: cashier.CashierId,
Name: cashier.Name,