开发优惠券相关的功能

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/CouponReceiveVo.java

@@ -1,5 +1,8 @@
 package com.ylx.massage.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ylx.massage.domain.Coupon;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -73,22 +77,62 @@ public class CouponReceiveVo{
     private String expirationTimeString;
 
     /**
-     * 门槛金额(分): 满X元生效，适用于满减/折扣
+     * 市场金额
+     */
+    @ApiModelProperty("市场金额")
+    private BigDecimal marketPrice;
+
+    /**
+     * 门槛金额: 满X元生效，适用于满减/折扣
      */
     private BigDecimal ruleMinSpendAmount;
 
     /**
-     * 折扣率: 如0.80表示8折，仅折扣券使用
+     * 折扣率: 适用于折扣券
      */
     private BigDecimal ruleDiscountRate;
 
     /**
-     * 折扣封顶金额(分): 折扣最高优惠
+     * 折扣上限金额: 适用于折扣券
      */
     private BigDecimal ruleDiscountCapAmount;
 
     /**
-     * 满减金额(分): 仅满减券使用
+     * 满减金额: 仅满减券使用
      */
-    private BigDecimal ruleReductionAmount;
+    private BigDecimal ruleDiscountRateAmount;
+
+    /** 所在地区码 */
+    private String country;
+
+    /** 所在地区全部码 */
+    private String countryAll;
+
+    /** 所在地区 */
+    private String locality;
+
+    /** 商户id */
+    private String merchantId;
+
+    /** 商户名称 */
+    private String storeName;
+
+    /** 关联类型 1-商品 2-商品分类 */
+    private String relatedType;
+
+    /** 关联ID（商品ID或分类ID） */
+    private String relatedId;
+
+    /** 关联名称 */
+    private String relatedName;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime updateTime;
 }

nightFragrance-massage/src/main/resources/mapper/massage/CouponReceiveMapper.xml

@@ -11,14 +11,24 @@
         <result property="validityType" column="validity_type" jdbcType="INTEGER"/>
         <result property="validStartTime" column="valid_start_time" jdbcType="TIMESTAMP"/>
         <result property="expirationTime" column="expiration_time" jdbcType="TIMESTAMP"/>
+        <result property="marketPrice" column="market_price" jdbcType="DECIMAL"/>
         <result property="ruleMinSpendAmount" column="rule_min_spend_amount" jdbcType="DECIMAL"/>
         <result property="ruleDiscountRate" column="rule_discount_rate" jdbcType="DECIMAL"/>
         <result property="ruleDiscountCapAmount" column="rule_discount_cap_amount" jdbcType="DECIMAL"/>
-        <result property="ruleReductionAmount" column="rule_reduction_amount" jdbcType="DECIMAL"/>
+        <result property="ruleDiscountRateAmount" column="rule_reduction_amount" jdbcType="DECIMAL"/>
+        <result property="country" column="country" jdbcType="VARCHAR"/>
+        <result property="countryAll" column="country_all" jdbcType="VARCHAR"/>
+        <result property="locality" column="locality" jdbcType="VARCHAR"/>
+        <result property="merchantId" column="merchant_id" jdbcType="VARCHAR"/>
+        <result property="storeName" column="store_name" jdbcType="VARCHAR"/>
+        <result property="relatedType" column="related_type" jdbcType="VARCHAR"/>
+        <result property="relatedId" column="related_id" jdbcType="VARCHAR"/>
+        <result property="relatedName" column="related_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="selectCouponReceiveVo">
-        distinct a.id, a.receive_open_id, a.coupon_id, b.coupon_name,a.validity_type,a.valid_start_time,a.expiration_time,a.coupon_status,b.market_price,a.create_time, a.update_time, a.is_delete
+        a.id, a.receive_open_id, a.coupon_id, b.coupon_name,a.coupon_type,a.validity_type,a.valid_start_time,a.expiration_time,a.coupon_status,b.market_price,a.create_time, a.update_time, a.is_delete,
+  b.rule_min_spend_amount,b.rule_discount_rate,b.rule_discount_cap_amount,b.rule_reduction_amount,b.country,b.country_all,b.locality,b.related_type,b.related_id,b.related_name
     </sql>
 
     <!-- 批量插入 -->
@@ -65,9 +75,8 @@
         SELECT
         <include refid="selectCouponReceiveVo"/>
         FROM coupon_receive a
-        LEFT JOIN user_coupon_relation b ON a.coupon_id = b.coupon_id
+        LEFT JOIN user_coupon_relation b ON a.coupon_id = b.coupon_id and b.open_id = a.receive_open_id
         WHERE a.is_delete = 0
-        AND a.coupon_status = 0
         and a.receive_open_id = #{openid}
     </select>