czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

消费返现 日期校验

Browse Source
This commit is contained in:
wangw
2025-10-17 15:40:14 +08:00
parent 15e826ddc1
commit fc6aaf8b35
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackRecordServiceImpl.java
View File

@@ -44,7 +44,10 @@ public class MkConsumeCashbackRecordServiceImpl extends ServiceImpl<MkConsumeCas
.leftJoin(ShopInfo.class).on(ShopInfo::getId, MkConsumeCashbackRecord::getShopId) .leftJoin(ShopInfo.class).on(ShopInfo::getId, MkConsumeCashbackRecord::getShopId)
.leftJoin(OrderInfo.class).on(OrderInfo::getId, MkConsumeCashbackRecord::getOrderId) .leftJoin(OrderInfo.class).on(OrderInfo::getId, MkConsumeCashbackRecord::getOrderId)
.leftJoin(ShopUser.class).on(ShopUser::getId, MkConsumeCashbackRecord::getShopUserId) .leftJoin(ShopUser.class).on(ShopUser::getId, MkConsumeCashbackRecord::getShopUserId)
.eq(MkConsumeCashbackRecord::getMainShopId, mainShopId).eq(MkConsumeCashbackRecord::getShopId, shopId); .eq(MkConsumeCashbackRecord::getMainShopId, mainShopId)
.le(MkConsumeCashbackRecord::getCreateTime, endTime)
.ge(MkConsumeCashbackRecord::getCreateTime, startTime)
.eq(MkConsumeCashbackRecord::getShopId, shopId);
if (StrUtil.isNotBlank(key)) { if (StrUtil.isNotBlank(key)) {
totalQuery.and(and -> { totalQuery.and(and -> {
and.or(or -> { and.or(or -> {

3
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -543,7 +543,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} }
if (newTotalAmount.compareTo(param.getOrderAmount()) != 0) { if (newTotalAmount.compareTo(param.getOrderAmount()) != 0) {
log.info(""" log.info("""
支付计算金额不正确，订单Id:{},支付计算金额为:{},商品总金额:{},临时菜价格:{},打包费:{}，餐位费:{}, 支付计算金额不正确，
订单Id:{},支付计算金额为:{},商品总金额:{},临时菜价格:{},打包费:{}，餐位费:{},
传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{}, 传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{},
商家最终改价:{},积分抵扣金额:{},抹零金额:{} 商家最终改价:{},积分抵扣金额:{},抹零金额:{}
""", """,