From a0263fedf185b61c3512c01e88ea90512d042b1a Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Sun, 29 Sep 2024 14:21:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=8C=E6=AD=A5v1.4.1=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=81=97=E6=BC=8F=E9=83=A8=E5=88=86=EF=BC=8C=E9=9B=B6?=
 =?UTF-8?q?=E5=94=AE=E6=98=8E=E7=BB=86=E4=B9=9F=E9=9C=80=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=A2=E5=8D=95=E7=9A=84=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/erp_order.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go
index 67e0a3b..e061cf7 100644
--- a/app/admin/models/erp_order.go
+++ b/app/admin/models/erp_order.go
@@ -4764,12 +4764,12 @@ func queryRetailDetailCommon(req *ErpOrderRetailDetailReq, c *gin.Context) (*Erp
 
 	// 退货订单支付汇总：目前零售退货订单暂时不展示各个方式的付款金额
 	var rejectedCashier TotalCashierData
-	//rejectedCashierQs := qs
-	//rejectedCashier, err = getTotalCashierData(rejectedCashierQs, RetailTypeRejected)
-	//if err != nil {
-	//	logger.Error("query erp_order_pay_way sum data err:", logger.Field("err", err))
-	//	return resp, err
-	//}
+	rejectedCashierQs := qs
+	rejectedCashier, err = getTotalCashierData(rejectedCashierQs, RetailTypeRejected)
+	if err != nil {
+		logger.Error("query erp_order_pay_way sum data err:", logger.Field("err", err))
+		return resp, err
+	}
 	// 计算销售订单和退货订单汇总后的支付数据
 	cashier = subtractCashierData(cashier, rejectedCashier)