1
This commit is contained in:
@@ -351,13 +351,10 @@ func (c *BaseScheduler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID st
|
|||||||
|
|
||||||
func (c *BaseScheduler) SetOrderWaybillTip(ctx *jxcontext.Context, vendorOrderID string, vendorID int, tipFee int64, isPay int) (errCode string, err error) {
|
func (c *BaseScheduler) SetOrderWaybillTip(ctx *jxcontext.Context, vendorOrderID string, vendorID int, tipFee int64, isPay int) (errCode string, err error) {
|
||||||
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
|
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
|
||||||
globals.SugarLogger.Debugf("========vendorOrderID : %s,%d,%d,%d", vendorOrderID, vendorID, tipFee, isPay)
|
|
||||||
globals.SugarLogger.Debugf("================order: %s", utils.Format4Output(order, false))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
errCode, err = c.CheckStoreBalanceWithTip(ctx, order, tipFee, isPay)
|
errCode, err = c.CheckStoreBalanceWithTip(ctx, order, tipFee, isPay)
|
||||||
globals.SugarLogger.Debugf("================errCode: %s,%v", errCode, err)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errCode, err
|
return errCode, err
|
||||||
}
|
}
|
||||||
@@ -405,7 +402,7 @@ func (c *BaseScheduler) CheckStoreBalanceWithTip(ctx *jxcontext.Context, order *
|
|||||||
}
|
}
|
||||||
// 是否确认支付
|
// 是否确认支付
|
||||||
if isPay != model.YES {
|
if isPay != model.YES {
|
||||||
return model.ErrCodeIsPaySure, fmt.Errorf("此订单已经支付小费[%d]元,本次增加小费[%d]元,总支出小费[%d]元", order.WaybillTipMoney/100, tipFee/100, order.WaybillTipMoney+tipFee/100)
|
return model.ErrCodeIsPaySure, fmt.Errorf("此订单已经支付小费[%d]元,本次增加小费[%d]元,总支出小费[%d]元", order.WaybillTipMoney/100, tipFee/100, (order.WaybillTipMoney+tipFee)/100)
|
||||||
}
|
}
|
||||||
|
|
||||||
return errCode, err
|
return errCode, err
|
||||||
|
|||||||
Reference in New Issue
Block a user