From 54a6fc255194b97fb01022c5756c55cd8860c52e Mon Sep 17 00:00:00 2001 From: chenlin Date: Tue, 1 Jul 2025 11:57:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=9B=B6=E5=94=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9B=B8=E5=85=B3=E6=94=AF=E4=BB=98=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=B8=8D=E8=83=BD=E4=B8=BA=E8=B4=9F=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=83=85=E5=86=B5=E5=B1=95=E7=A4=BA=EF=BC=9B=202=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=A8=E5=BA=97=E9=94=80=E5=94=AE=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=EF=BC=8C=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=B6=E9=97=B4=EF=BC=9B=E9=81=BF=E5=85=8D=E8=B7=A8?= =?UTF-8?q?=E6=9C=88=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/decision.go | 4 ++-- app/admin/models/erp_order.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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,