liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-01-23 18:40:17 +08:00
parent 94af190c02
commit ad0f120c6b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -2,11 +2,10 @@ package basesch
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
"strings" "strings"
"time" "time"
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
"git.rosy.net.cn/baseapi/platformapi/jdshopapi" "git.rosy.net.cn/baseapi/platformapi/jdshopapi"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi"
@@ -385,9 +384,9 @@ func (c *BaseScheduler) CheckStoreBalanceWithTip(ctx *jxcontext.Context, order *
if roundTipFee != tipFee { if roundTipFee != tipFee {
return model.ErrCodeOnePayTipFeeMore, fmt.Errorf("小费必须是1元的整数倍") return model.ErrCodeOnePayTipFeeMore, fmt.Errorf("小费必须是1元的整数倍")
} }
if order.WaybillTipMoney >= tipFee { //if order.WaybillTipMoney >= tipFee {
return model.ErrCodeOnePayTipFeeMore, fmt.Errorf("本次小费金额不能小于已经支付的小费") // return model.ErrCodeOnePayTipFeeMore, fmt.Errorf("本次小费金额不能小于已经支付的小费")
} //}
if order.CreateDeliveryType == model.YES { if order.CreateDeliveryType == model.YES {
//加小费只判断余额 //加小费只判断余额
storeAcct, err := cms.GetStoreAcctBalance(ctx, jxutils.GetSaleStoreIDFromOrder(order)) storeAcct, err := cms.GetStoreAcctBalance(ctx, jxutils.GetSaleStoreIDFromOrder(order))