From eb31057b3ee942e090b82f24560b9b6b9eed87a3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 19 Sep 2025 11:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E6=8A=B5=E6=89=A3=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/sa/MyStpLogic.java               | 7 +------
 .../src/main/java/com/czg/account/vo/UserCouponVo.java     | 4 ++++
 .../src/main/resources/mapper/MkShopCouponRecordMapper.xml | 3 +++
 .../service/order/service/impl/OrderInfoServiceImpl.java   | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
index 252a43f5..9a5f493b 100644
--- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
+++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
@@ -233,12 +233,7 @@ public class MyStpLogic {
      * @return 主店id
      */
     public Long getHeadShopId() {
-        Long shopId = getShopId(0L);
-        Long mainId = DbChain.table("tb_shop_config").select("main_id").where("id = ?", shopId).objAs(Long.class);
-        if (mainId != null) {
-            return mainId;
-        }
-        return shopId;
+        return getHeadShopId(getShopId(0L));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
index e2f285a4..f46f40d2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
@@ -26,6 +26,10 @@ public class UserCouponVo {
     private Integer type;
     //到期时间
     private Date endTime;
+    //可抵扣数量 商品券使用
+    private Integer discountNum;
+    private String useRule;
+    private String ruleDetails;
     private String useRestrictions;
     private boolean isUse = false;
     /**
diff --git a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
index 0cc35307..d35377ff 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
@@ -62,6 +62,9 @@
         inRecord.name as name,
         inRecord.type,
         coupon.foods as foods,
+        coupon.use_rule as useRule,
+        coupon.rule_details as ruleDetails,
+        coupon.discount_num as discountNum,
         inRecord.use_end_time as endTime
         FROM
         mk_shop_coupon_record inRecord
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 cb9d81c3..f9a9105d 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
@@ -1151,7 +1151,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         log.error("订单积分使用或优惠券扣除失败，订单id：{}", orderInfo.getId());
                     }
                 } else {
-                    //TODO 新客立减
+                    //新客立减
                     if (param.getNewCustomerDiscountId() != null) {
                         newConsumerDiscountRecordService.useDiscount(param.getNewCustomerDiscountId(), shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
                     }