From 332cda88928aa3afa48ae71b264a6be70c4da82f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 10 Nov 2025 15:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0=20?=
 =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkConsumeCashbackServiceImpl.java       |  4 +---
 .../MkShopConsumeDiscountRecordServiceImpl.java  | 16 ++++++++--------
 .../service/impl/ShopCouponServiceImpl.java      | 10 +++++-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
index 61111c54f..7a03bd90f 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
@@ -125,10 +125,8 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
         if (StrUtil.isNotBlank(config.getApplicableUser()) && !"all".equals(config.getApplicableUser())) {
             if ("new".equals(config.getApplicableUser())) {
                 boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
-                        .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
-                log.info("消费返现 new用户校验1, orderId: {}, exists: {}", orderId, exists);
+                        .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()));
                 if (exists) {
-                    log.info("消费返现 new用户校验2, orderId: {}, exists: {}", orderId, exists);
                     return;
                 }
             } else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) {
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
index 7ebdb7881..010146724 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
@@ -70,15 +70,15 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
             throw new ApiNotPrintException("随机立减配置错误");
         }
         ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
-        long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
-                .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
-        AssertUtil.isTrue(count > 0, "新客立减仅限新用户使用");
+        boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
+                .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()));
+        AssertUtil.isTrue(exists, "新客立减仅限新用户使用");
 
 
-        long recordCount = count(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId).eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId())
+        boolean exists1 = exists(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId).eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId())
                 .eq(MkShopConsumeDiscountRecord::getIsUse, 1));
 
-        AssertUtil.isTrue(recordCount > 0, "新客立减已使用");
+        AssertUtil.isTrue(exists1, "新客立减已使用");
 
         return consumeDiscountVO;
     }
@@ -115,9 +115,9 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
             }
             return discountRecord;
         }
-        long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
-                .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
-        if (count > 0) {
+        boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
+                .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()));
+        if (exists) {
 //            throw new ApiNotPrintException("新客立减仅新用户可用");
             log.info("新客立减仅限新用户使用");
             return null;
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
index 4389a6bf0..361f07db1 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
@@ -112,13 +112,13 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
             if (!"all".equals(coupon.getGetUserType())) {
                 if ("new".equals(coupon.getGetUserType())) {
                     isNotNewUser = false;
-                    long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, userId)
-                            .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
-                    if (count > 0) {
+                    boolean exists = orderInfoService.exists(new QueryWrapper().eq(OrderInfo::getUserId, userId)
+                            .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()));
+                    if (exists) {
                         continue;
                     }
-                    long count1 = recordService.count(new QueryWrapper().eq(MkShopCouponRecord::getCouponSyncId, coupon.getSyncId()));
-                    if (count1 > 0) {
+                    boolean exists1 = recordService.exists(new QueryWrapper().eq(MkShopCouponRecord::getCouponSyncId, coupon.getSyncId()));
+                    if (exists1) {
                         continue;
                     }
                 } else if ("vip".equals(coupon.getGetUserType()) && shopUser.getIsVip() != 1) {