From 75553fa63d6b26b7bb6e6a06c3d329cd2f64008d Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Mon, 9 Sep 2024 16:34:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9B=B6=E5=94=AE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E6=B1=87=E6=80=BB=E6=89=A3=E9=99=A4=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=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 da40df0..8fabd28 100644
--- a/app/admin/models/erp_order.go
+++ b/app/admin/models/erp_order.go
@@ -4546,12 +4546,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)