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(OrderInfo.class).on(OrderInfo::getId, MkConsumeCashbackRecord::getOrderId)
.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)) {
totalQuery.and(and -> {
and.or(or -> {