minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、同步v1.4.1代码遗漏部分，零售明细也需查询退货订单的支付汇总；

Browse Source
This commit is contained in:
chenlin 2024-09-29 14:21:32 +08:00
parent 4e7aa8caed
commit a0263fedf1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/admin/models/erp_order.go
View File

@ -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)