diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index f8c19e337..25be1c691 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -559,16 +559,10 @@ func countWaybillSettleInfo(db *dao.DaoDB, order *model.GoodsOrder, bill *model. return err } - //if deductFee != model.NO { - // 更新运单实际扣除费用 - bill.ActualFee = deductFee - bill.DesiredFee = deductFee - globals.SugarLogger.Debugf("bill ======== %s", utils.Format4Output(bill, false)) - if _, err = dao.UpdateEntity(db, bill, "ActualFee", "DesiredFee"); err != nil { - globals.SugarLogger.Errorf("更新门店配送信息错误:%d,%v", deductFee, err) + if err = dao.UpdateWaybillActualFee(db, bill.VendorWaybillID, bill.VendorOrderID, deductFee, deductFee); err != nil { + globals.SugarLogger.Debugf("================ err := %v", err) + return err } - //} - // 门店发单,支付运单违约金 if store != nil && store.CreateDeliveryType == model.YES && deductFee != model.NO { err = partner.CurStoreAcctManager.InsertStoreAcctExpendAndUpdateStoreAcctBalance(jxcontext.AdminCtx, store.ID, int(deductFee), partner.StoreAcctTypeExpendCreateWaybillDeductFee, bill.VendorOrderID, bill.VendorWaybillID, 0) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index a50b9c593..deccb62cd 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1466,6 +1466,13 @@ func GetOrdersForJxPay(db *DaoDB, finishTimeBegin, finishTimeEnd time.Time) (goo return goods, err } +// UpdateWaybillActualFee 修改运单实际支付价格 +func UpdateWaybillActualFee(db *DaoDB, vendorWaybillId, vendorOrderId string, actualFee, desiredFee int64) error { + sql := ` UPDATE waybill SET actual_fee = ? ,desired_fee = ? WHERE vendor_order_id = ? AND vendor_waybill_id = ?` + _, err := ExecuteSQL(db, sql, []interface{}{actualFee, desiredFee, vendorOrderId, vendorWaybillId}...) + return err +} + func GetWaybills(db *DaoDB, vendorOrderID string, vendors []int64) (waybills []*model.Waybill, err error) { sql := ` SELECT * FROM waybill