This commit is contained in:
richboo111
2024-01-23 16:46:50 +08:00
parent c6b5305353
commit 28922e913f
16 changed files with 258 additions and 180 deletions

View File

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