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)