From d6b96563a13884f03f4ca3c810813354ad32dc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 May 2023 09:19:24 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index f610b159b..19c582ed9 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -530,15 +530,15 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.W cancelWaybill[bill.VendorWaybillID] = bill // 已经全部运单取消,退款结算 if len(bills) == len(cancelWaybill) { - for _, v := range bills { - if v.VendorWaybillID == bill.VendorWaybillID { - continue - } - // 已经取消订单的违约金计算 - if err = countWaybillSettleInfo(db, order, v, store); err != nil { - return err - } - } + //for _, v := range bills { + // if v.VendorWaybillID == bill.VendorWaybillID { + // continue + // } + // // 已经取消订单的违约金计算 + // if err = countWaybillSettleInfo(db, order, v, store); err != nil { + // return err + // } + //} // 最终的金额核算,多退少补 if err = orderFeeSettle(db, order, bill, bills, store); err != nil {