1
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user