diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index ea457da05..bf5d4c83c 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1327,7 +1327,7 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa func (s *DefScheduler) updateStoreAccount(order *model.GoodsOrder, bill *model.Waybill) { realDesiredFee := bill.DesiredFee - if expend, lastFee, err := partner.CurStoreAcctManager.GetStoreAcctExpendLastCreateWayBillFee(order.VendorOrderID); err == nil { + if expend, lastFee, err := partner.CurStoreAcctManager.GetStoreAcctExpendLastCreateWayBillFee(order.VendorOrderID); err == nil && expend != nil { lastFee64 := int64(lastFee) if lastFee64 != realDesiredFee { var diffFee int64 diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 2d57b9e0e..6b0a5490a 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1171,13 +1171,14 @@ func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (ex ORDER BY a.created_at DESC LIMIT 1 ` - err = GetRow(db, &expend, sql, sqlParams) - lastFee = expend.ExpendPrice - if expend.ExpID != 0 { - lastFee += expend.MulitExpendPrice - } - if expend.IncID != 0 { - lastFee -= expend.MulitIncomePrice + if err = GetRow(db, &expend, sql, sqlParams); err == nil && expend != nil { + lastFee = expend.ExpendPrice + if expend.ExpID != 0 { + lastFee += expend.MulitExpendPrice + } + if expend.IncID != 0 { + lastFee -= expend.MulitIncomePrice + } } return expend, lastFee, err }