This commit is contained in:
邹宗楠
2023-07-20 11:32:23 +08:00
parent b54ce24365
commit 4b09a33783
3 changed files with 14 additions and 8 deletions

View File

@@ -476,7 +476,7 @@ func FinisOrderWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.Wa
return nil
}
// 查询所有运单
bills, err := dao.GetWaybills(db, order.VendorOrderID, nil)
bills, err := dao.GetWaybills(db, order.VendorOrderID, []int64{model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS})
if err != nil {
return err
}
@@ -531,8 +531,8 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.W
if err := countWaybillSettleInfo(db, order, bill, store); err != nil {
return err
}
// 所有运单停止调度之后才开始退还余额
bills, err := dao.GetWaybills(db, order.VendorOrderID, nil)
// 所有运单停止调度之后才开始退还余额(三方运单)
bills, err := dao.GetWaybills(db, order.VendorOrderID, []int64{model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDMTPS, model.VendorIDUUPT, model.VendorIDSFPS})
if err != nil {
return err
}