This commit is contained in:
邹宗楠
2023-05-18 14:39:07 +08:00
parent 79aa575b8b
commit 72c9b89fae

View File

@@ -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) {
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 {
return "", err
}
errCode, err = c.CheckStoreBalanceWithTip(ctx, order, tipFee, isPay)
globals.SugarLogger.Debugf("================errCode: %s,%v", errCode, err)
if err != nil {
return errCode, err
}
@@ -405,7 +402,7 @@ func (c *BaseScheduler) CheckStoreBalanceWithTip(ctx *jxcontext.Context, order *
}
// 是否确认支付
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