From 9bdb09232c6a36dfed8aeb12f1ed68d41c35673e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Oct 2025 18:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=94=B3=E8=AF=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=20=E5=A1=AB=E5=85=85=E5=95=86=E5=AE=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=20=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/dto/SmsShopTemplateDTO.java |  2 ++
 .../impl/SmsShopTemplateServiceImpl.java       | 18 +++++++++++++++++-
 .../service/impl/OrderInfoServiceImpl.java     |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java
index 2ce788e11..6d1f82883 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java
@@ -84,4 +84,6 @@ public class SmsShopTemplateDTO implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    private String shopName;
+
 }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java
index e8e508e13..ed4b43308 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java
@@ -1,6 +1,8 @@
 package com.czg.service.market.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.czg.account.entity.ShopInfo;
+import com.czg.account.service.ShopInfoService;
 import com.czg.config.RabbitPublisher;
 import com.czg.market.dto.SmsShopTemplateDTO;
 import com.czg.market.dto.SmsTemplateQueryDTO;
@@ -13,6 +15,7 @@ import com.czg.market.entity.SmsShopTemplate;
 import com.czg.market.service.SmsShopTemplateService;
 import com.czg.service.market.mapper.SmsShopTemplateMapper;
 import jakarta.annotation.Resource;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -29,6 +32,8 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
 
     @Resource
     private RabbitPublisher rabbitPublisher;
+    @DubboReference
+    private ShopInfoService shopInfoService;
 
     @Override
     public List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId, Integer status) {
@@ -61,7 +66,18 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
                 .eq(SmsShopTemplate::getShopId, param.getShopId())
                 .orderBy(SmsShopTemplate::getShopId).asc()
                 .orderBy(SmsShopTemplate::getSort).asc();
-        return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);
+        Page<SmsShopTemplateDTO> page = pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);
+        if (param.getShopId() == null) {
+            Map<Long, String> shopNameMap = new HashMap<>();
+            for (SmsShopTemplateDTO record : page.getRecords()) {
+                if (!shopNameMap.containsKey(record.getShopId())) {
+                    ShopInfo shopInfo = shopInfoService.getById(record.getShopId());
+                    shopNameMap.put(record.getShopId(), shopInfo.getShopName());
+                }
+                record.setShopName(shopNameMap.get(record.getShopId()));
+            }
+        }
+        return page;
     }
 
     @Override
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index dc6ba1f9f..4ad18d3f6 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -133,6 +133,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     private MkDiscountActivityService discountActService;
     @Resource
     private MkShopRechargeService shopRechargeService;
+    @Resource
+    private MkConsumeCashbackService consumeCashbackService;
     // 延迟 5 秒
     private static final long DELAY = 5;
     //重试次数
@@ -1090,6 +1092,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         || (payType != null && !ArrayUtil.contains(payTypes, payType))) {
                     //下单赠送积分
                     pointsService.consumeAwardPoints(shopUser.getId(), orderInfo);
+                    if(!orderInfo.getPayType().equals(PayEnums.CASH_PAY.getValue())){
+                        consumeCashbackService.cashback(orderInfo.getShopId(), shopUser.getUserId(), orderInfo.getPayAmount(), orderInfo.getId(), orderInfo.getOrderNo());
+                    }
                 }
             }
         }