From c3d1524c40dc74e135c2745606601550a25d49d4 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 25 Sep 2025 18:10:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F=20?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E5=92=8C=20=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/OrderInfoServiceImpl.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 2506a4699..f3ce8af91 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
@@ -943,6 +943,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     log.error("订单积分使用或优惠券扣除失败，订单id：{}", orderInfo.getId());
                 }
             } else {
+                //新客立减
+                if (orderInfo.getNewCustomerDiscountAmount() != null) {
+                    newConsumerDiscountRecordService.useDiscount(shopUser.getId(), orderInfo.getId(), orderInfo.getNewCustomerDiscountAmount());
+                }
                 //积分使用
                 if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
                     pointsService.deductPoints(shopUser.getId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
@@ -1139,7 +1143,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 } else {
                     //新客立减
                     if (param.getNewCustomerDiscountId() != null) {
-                        newConsumerDiscountRecordService.useDiscount(param.getNewCustomerDiscountId(), shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
+                        newConsumerDiscountRecordService.checkDiscount(param.getNewCustomerDiscountId(), shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
                     }
                     //积分使用
                     if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {

From 8b6dfabd8e3065f1029782ba323b6c92af83bda1 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 26 Sep 2025 09:19:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MkShopCouponRecordMapper.xml       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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 583fb8992..f4f09f60a 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
@@ -36,24 +36,24 @@
         order by record.create_time desc
     </select>
     <select id="findCouponVOByUser" resultType="com.czg.market.vo.UserCouponVO">
-        select mk_shop_coupon_record.*,
+        select mk_shop_coupon_record.*,mk_shop_coupon_record.id as id,
         mk_shop_coupon_record.use_start_time as effectStartTime,
         mk_shop_coupon_record.use_end_time as effectEndTime,
-               coupon.use_shop_type as useShopType,
-               coupon.foods as foods,
-               coupon.use_shops as useShops,
-               coupon.shop_id as shopId,
-               coupon.use_type as useType,
-               coupon.use_days as useDays,
-               coupon.use_time_type as useTimeType,
-               coupon.use_start_time as useStartTime,
-               coupon.use_end_time as useEndTime,
-               coupon.get_limit as getLimit,
-               coupon.use_limit as useLimit,
-               coupon.discount_share as discountShare,
-               coupon.vip_price_share as vipPriceShare,
-               coupon.rule_details as ruleDetails,
-               coupon.discount_num as discountNum
+        coupon.use_shop_type as useShopType,
+        coupon.foods as foods,
+        coupon.use_shops as useShops,
+        coupon.shop_id as shopId,
+        coupon.use_type as useType,
+        coupon.use_days as useDays,
+        coupon.use_time_type as useTimeType,
+        coupon.use_start_time as useStartTime,
+        coupon.use_end_time as useEndTime,
+        coupon.get_limit as getLimit,
+        coupon.use_limit as useLimit,
+        coupon.discount_share as discountShare,
+        coupon.vip_price_share as vipPriceShare,
+        coupon.rule_details as ruleDetails,
+        coupon.discount_num as discountNum
         from mk_shop_coupon_record
         left join mk_shop_coupon coupon on mk_shop_coupon_record.coupon_id = coupon.id
         where mk_shop_coupon_record.shop_user_id in

From 56ed87e3b5f202eb3ef84527fe2c521e5de4d6f5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 26 Sep 2025 09:28:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?id=E9=97=AE=E9=A2=982=20=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=E5=BA=8F=E5=88=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/market/dto/MemberLevelDTO.java |  3 ++-
 .../resources/mapper/MkShopCouponRecordMapper.xml    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java
index 1e5f8d068..7d605e1e2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java
@@ -6,10 +6,11 @@ import com.czg.validator.group.member.MemberLevelCycleRewardGroup;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class MemberLevelDTO {
+public class MemberLevelDTO implements Serializable {
     /**
      * ID
      */
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 f4f09f60a..b150647a2 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
@@ -36,9 +36,19 @@
         order by record.create_time desc
     </select>
     <select id="findCouponVOByUser" resultType="com.czg.market.vo.UserCouponVO">
-        select mk_shop_coupon_record.*,mk_shop_coupon_record.id as id,
+        select
+        mk_shop_coupon_record.id as id,
+        mk_shop_coupon_record.name as name,
+        mk_shop_coupon_record.type as type,
+        mk_shop_coupon_record.full_amount as fullAmount,
+        mk_shop_coupon_record.discount_amount as discountAmount,
+        mk_shop_coupon_record.discount_rate as discountRate,
+        mk_shop_coupon_record.max_discount_amount as maxDiscountAmount,
+        mk_shop_coupon_record.create_time as createTime,
+        mk_shop_coupon_record.use_time as useTime,
         mk_shop_coupon_record.use_start_time as effectStartTime,
         mk_shop_coupon_record.use_end_time as effectEndTime,
+        mk_shop_coupon_record.status as status,
         coupon.use_shop_type as useShopType,
         coupon.foods as foods,
         coupon.use_shops as useShops,