From 9881e501769e384d40205efcaebe84d400805a97 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Oct 2025 16:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkConsumeCashbackServiceImpl.java       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 d3ff5b8e..24120e3d 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
@@ -17,6 +17,9 @@ import com.czg.market.dto.MkConsumeDiscountDTO;
 import com.czg.market.entity.*;
 import com.czg.market.service.MkConsumeCashbackRecordService;
 import com.czg.market.vo.MkConsumeCashbackVO;
+import com.czg.order.entity.OrderInfo;
+import com.czg.order.service.OrderInfoService;
+import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.update.UpdateWrapper;
@@ -48,6 +51,8 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
     private ShopInfoService shopInfoService;
     @DubboReference
     private ShopUserService shopUserService;
+    @DubboReference
+    private OrderInfoService orderInfoService;
     @Resource
     private MkConsumeCashbackRecordService consumeCashbackRecordService;
 
@@ -105,6 +110,17 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
         }
         log.info("消费返现2, orderId: {}, orderNo: {}, config: {}", orderId, orderNo, config);
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainShopId).eq(ShopUser::getUserId, userId));
+        if (StrUtil.isNotBlank(config.getApplicableUser()) && !"all".equals(config.getApplicableUser())) {
+            if ("new".equals(config.getApplicableUser())) {
+                long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
+                        .eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
+                if (count > 0) {
+                    return;
+                }
+            } else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) {
+                return;
+            }
+        }
         List<MkConsumeCashbackStep> cashbackStepList = config.getCashbackStepList();
         log.info("消费返现2, orderId: {}, cashbackStepList:{}", orderId, cashbackStepList);
         if (CollUtil.isNotEmpty(cashbackStepList)) {