From e6888b35795d3ce1f720cbf67966836ddbc07312 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 7 Nov 2025 16:52:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=BF=94=E7=8E=B0=20?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkConsumeCashbackServiceImpl.java        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 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 8c27a07dc..9c1153240 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
@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
-import com.czg.account.entity.ShopConfig;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopConfigService;
@@ -13,21 +12,20 @@ import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
 import com.czg.enums.ShopUserFlowBizEnum;
-import com.czg.exception.ApiNotPrintException;
 import com.czg.market.dto.MkConsumeCashbackDTO;
-import com.czg.market.dto.MkConsumeDiscountDTO;
-import com.czg.market.entity.*;
+import com.czg.market.entity.MkConsumeCashback;
+import com.czg.market.entity.MkConsumeCashbackRecord;
+import com.czg.market.entity.MkConsumeCashbackStep;
 import com.czg.market.service.MkConsumeCashbackRecordService;
+import com.czg.market.service.MkConsumeCashbackService;
 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.service.market.mapper.MkConsumeCashbackMapper;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.core.update.UpdateWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.czg.market.service.MkConsumeCashbackService;
-import com.czg.service.market.mapper.MkConsumeCashbackMapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -61,6 +59,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
     private OrderInfoService orderInfoService;
     @DubboReference
     private ShopConfigService shopConfigService;
+    BigDecimal bili = BigDecimal.valueOf(100);
     @Resource
     private MkConsumeCashbackRecordService consumeCashbackRecordService;
 
@@ -147,7 +146,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
                     if (TableValueConstant.MkConsumeCashback.CashbackType.FIX.getCode().equals(config.getCashbackType())) {
                         cashbackAmount = cashbackStep.getCashbackAmount();
                     } else {
-                        cashbackAmount = amount.multiply(cashbackStep.getCashbackAmount().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
+                        cashbackAmount = amount.multiply(cashbackStep.getCashbackAmount().divide(bili, 2, RoundingMode.DOWN)).setScale(2, RoundingMode.DOWN);
                     }
                     if (cashbackAmount.compareTo(BigDecimal.ZERO) <= 0) {
                         return;

From 8d4d414e4e3c61dd9d0d5228061860b70bb427f3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 7 Nov 2025 17:20:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkConsumeCashbackServiceImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9c1153240..db346cf31 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,7 +125,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
         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));
+                        .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
                 if (count > 0) {
                     return;
                 }

From 84bdfe17424029c229ee829be12651409c557b20 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 7 Nov 2025 17:28:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MkConsumeCashbackServiceImpl.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 db346cf31..c892ea551 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
@@ -126,7 +126,9 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
             if ("new".equals(config.getApplicableUser())) {
                 long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
                         .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
-                if (count > 0) {
+                log.info("消费返现 new用户校验1, orderId: {}, count: {}", orderId, count);
+                if (count > 0L) {
+                    log.info("消费返现 new用户校验2, orderId: {}, count: {}", orderId, count);
                     return;
                 }
             } else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) {
@@ -165,4 +167,11 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
             }
         }
     }
+
+    public static void main(String[] args) {
+        long count = 15L;
+        if (count > 0) {
+            System.out.println(1);
+        }
+    }
 }