diff --git a/app/admin/models/decision.go b/app/admin/models/decision.go index 83587eb..3728b01 100644 --- a/app/admin/models/decision.go +++ b/app/admin/models/decision.go @@ -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) diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 2798a05..6ced8b0 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -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,