This commit is contained in:
邹宗楠
2023-05-19 09:19:24 +08:00
parent f3d285495f
commit d6b96563a1

View File

@@ -530,15 +530,15 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.W
cancelWaybill[bill.VendorWaybillID] = bill cancelWaybill[bill.VendorWaybillID] = bill
// 已经全部运单取消,退款结算 // 已经全部运单取消,退款结算
if len(bills) == len(cancelWaybill) { if len(bills) == len(cancelWaybill) {
for _, v := range bills { //for _, v := range bills {
if v.VendorWaybillID == bill.VendorWaybillID { // if v.VendorWaybillID == bill.VendorWaybillID {
continue // continue
} // }
// 已经取消订单的违约金计算 // // 已经取消订单的违约金计算
if err = countWaybillSettleInfo(db, order, v, store); err != nil { // if err = countWaybillSettleInfo(db, order, v, store); err != nil {
return err // return err
} // }
} //}
// 最终的金额核算,多退少补 // 最终的金额核算,多退少补
if err = orderFeeSettle(db, order, bill, bills, store); err != nil { if err = orderFeeSettle(db, order, bill, bills, store); err != nil {