From 72c9b89faeb01d625a5db7280f2ed4773a53da1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 18 May 2023 14:39:07 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/basesch/basesch_ext.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 16f7cb1a0..4e3d878ec 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -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