liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-05-16 16:12:09 +08:00
parent aaca0e21af
commit b7c1e8638b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order.go
View File

@@ -484,7 +484,7 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.W
globals.SugarLogger.Errorf("InsertStoreAcctIncomeAndUpdateStoreAcctBalance 483 : %v", err)
}
}
if store != nil && store.CreateDeliveryType == model.NO {
if store != nil && store.CreateDeliveryType == model.NO && deductFee != model.NO {
err = partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, store.BrandID, int(deductFee), model.BrandBillTypeExpend, model.BrandBillFeeTypeDeductFee, order.VendorOrderID, order.VendorWaybillID)
if err != nil {
globals.SugarLogger.Errorf("InsertBrandBill 489 : %v", err)

3
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -506,7 +506,6 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, false); savedOrderInfo != nil {
timeoutSecond = savedOrderInfo.GetCreateWaybillTimeout()
}
globals.SugarLogger.Debugf("==============storeCourierList := %s", utils.Format4Output(storeCourierList, false))
for _, storeCourier := range storeCourierList {
var feeInfo *partner.WaybillFeeInfo
if waybillMap[storeCourier.VendorID] != nil {
@@ -531,7 +530,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
} else {
feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 加收两毛
feeInfo.TimeoutSecond = timeoutSecond
globals.SugarLogger.Debugf("==============GetWaybillFee := %s", utils.Format4Output(feeInfo, false))
globals.SugarLogger.Debugf("预下单加价==============GetWaybillFee := %s", utils.Format4Output(feeInfo, false))
}
} else {
feeInfo = &partner.WaybillFeeInfo{