Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java

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
      */

cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml

@@ -36,24 +36,34 @@
         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.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,
-               coupon.use_shop_type as useShopType,
+        mk_shop_coupon_record.status as status,
-               coupon.foods as foods,
+        coupon.use_shop_type as useShopType,
-               coupon.use_shops as useShops,
+        coupon.foods as foods,
-               coupon.shop_id as shopId,
+        coupon.use_shops as useShops,
-               coupon.use_type as useType,
+        coupon.shop_id as shopId,
-               coupon.use_days as useDays,
+        coupon.use_type as useType,
-               coupon.use_time_type as useTimeType,
+        coupon.use_days as useDays,
-               coupon.use_start_time as useStartTime,
+        coupon.use_time_type as useTimeType,
-               coupon.use_end_time as useEndTime,
+        coupon.use_start_time as useStartTime,
-               coupon.get_limit as getLimit,
+        coupon.use_end_time as useEndTime,
-               coupon.use_limit as useLimit,
+        coupon.get_limit as getLimit,
-               coupon.discount_share as discountShare,
+        coupon.use_limit as useLimit,
-               coupon.vip_price_share as vipPriceShare,
+        coupon.discount_share as discountShare,
-               coupon.rule_details as ruleDetails,
+        coupon.vip_price_share as vipPriceShare,
-               coupon.discount_num as discountNum
+        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

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(shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
+                        newConsumerDiscountRecordService.checkDiscount(param.getNewCustomerDiscountId(), shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
                     }
                     //积分使用
                     if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {