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-19 11:42:41 +08:00
parent 764d74e902
commit 538479d55d
5 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,9 +559,7 @@ func countWaybillSettleInfo(db *dao.DaoDB, order *model.GoodsOrder, bill *model.
return err
}
globals.SugarLogger.Debugf("========%s", utils.Format4Output(bill, false))
if err = dao.UpdateWaybillActualFee(db, bill.VendorWaybillID, bill.VendorOrderID, deductFee, deductFee); err != nil {
globals.SugarLogger.Debugf("================ err := %v", err)
return err
}
// 门店发单,支付运单违约金
@@ -569,7 +567,6 @@ func countWaybillSettleInfo(db *dao.DaoDB, order *model.GoodsOrder, bill *model.
err = partner.CurStoreAcctManager.InsertStoreAcctExpendAndUpdateStoreAcctBalance(jxcontext.AdminCtx, store.ID, int(deductFee), partner.StoreAcctTypeExpendCreateWaybillDeductFee, bill.VendorOrderID, bill.VendorWaybillID, 0)
if err != nil {
partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("订单[%s],运单平台[%d],运单[%s]取消,获取违约金门店扣除失败:%v,金额[%d]", order.VendorOrderID, bill.WaybillVendorID, bill.VendorWaybillID, err, deductFee), "")
globals.SugarLogger.Errorf("InsertStoreAcctIncomeAndUpdateStoreAcctBalance 483 : %v", err)
return err
}
}
@@ -578,7 +575,6 @@ func countWaybillSettleInfo(db *dao.DaoDB, order *model.GoodsOrder, bill *model.
err = partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, store.BrandID, int(deductFee), model.BrandBillTypeExpend, model.BrandBillFeeTypeDeductFee, order.VendorOrderID, order.VendorWaybillID)
if err != nil {
partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("订单[%s],运单平台[%d],运单[%s]取消,获取违约金品牌扣除失败:%v,金额[%d]", order.VendorOrderID, bill.WaybillVendorID, bill.VendorWaybillID, err, deductFee), "")
globals.SugarLogger.Errorf("InsertBrandBill 489 : %v", err)
return err
}
}