优惠券新增字段：领取方式

entity/src/main/java/com/kym/entity/admin/Coupon.java

@@ -28,6 +28,9 @@ public class Coupon extends BaseEntity {
     public static final String COUPON_TYPE_折扣券 = "Discount";
     public static final String COUPON_TYPE_满减券 = "FullDiscount";
 
+    public static final String RECEIVE_TYPE_系统发放 = "Release";
+    public static final String RECEIVE_TYPE_主动领取 = "Collect";
+
     public static final int STATUS_无效 = 0;
     public static final int STATUS_有效 = 1;
 
@@ -64,6 +67,11 @@ public class Coupon extends BaseEntity {
      */
     private Integer validity;
 
+    /**
+     * 领取方式：Release-系统发放，Collect-主动领取
+     */
+    private String receiveType;
+
     /**
      * 券种：Discount折扣券、FullDiscount满减券
      */

entity/src/main/java/com/kym/entity/admin/vo/CouponVo.java

@@ -45,6 +45,11 @@ public class CouponVo extends BaseEntity {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
+    /**
+     * 领取方式：Release-系统发放，Collect-主动领取
+     */
+    private String receiveType;
+
     /**
      * 券种：Discount折扣券、FullDiscount满减券
      */

entity/src/main/java/com/kym/entity/miniapp/UserCoupon.java

@@ -80,6 +80,11 @@ public class UserCoupon extends BaseEntity {
      */
     private Integer validity;
 
+    /**
+     * 领取方式：Release-系统发放，Collect-主动领取
+     */
+    private String receiveType;
+
     /**
      * 券种：折扣券、满减券
      */

entity/src/main/java/com/kym/entity/miniapp/vo/UserCouponVo.java

@@ -74,6 +74,11 @@ public class UserCouponVo extends BaseEntity {
      */
     private Integer validity;
 
+    /**
+     * 领取方式：Release-系统发放，Collect-主动领取
+     */
+    private String receiveType;
+
     /**
      * 券种：折扣券、满减券
      */

mapper/src/main/resources/mappers/admin/CouponMapper.xml

@@ -11,6 +11,7 @@
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="validity" property="validity" />
+        <result column="receive_type" property="receiveType" />
         <result column="coupon_type" property="couponType" />
         <result column="min_service_money" property="minServiceMoney" />
         <result column="discount" property="discount" />
@@ -24,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,activity_id,name, coupon_desc, start_time, end_time, validity,coupon_type, min_service_money, discount, allow_stacke, quantity, status, remark,create_time,update_time
+        id,activity_id,name, coupon_desc, start_time, end_time, validity,receive_type,coupon_type, min_service_money, discount, allow_stacke, quantity, status, remark,create_time,update_time
     </sql>
 
 </mapper>

mapper/src/main/resources/mappers/miniapp/UserCouponMapper.xml

@@ -11,6 +11,7 @@
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="validity" property="validity" />
+        <result column="receive_type" property="receiveType" />
         <result column="coupon_type" property="couponType" />
         <result column="discount" property="discount" />
         <result column="min_service_money" property="minServiceMoney" />
@@ -24,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,oupon_id, activity_id, user_id, start_time, end_time, validity,coupon_type, discount, min_service_money, allow_stacke, status, usage_status,remark,create_time,update_time
+        id,oupon_id, activity_id, user_id, start_time, end_time, validity,receive_type,coupon_type, discount, min_service_money, allow_stacke, status, usage_status,remark,create_time,update_time
     </sql>
 
 </mapper>