Merge branch 'release_lutong_bug' into sit

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponFriendRuleVo.java

@@ -64,5 +64,13 @@ public class LifeDiscountCouponFriendRuleVo extends LifeDiscountCouponFriendRule
     @ApiModelProperty(value = "折扣率（0-100，用于折扣券，例如80表示8折，仅折扣券有值）")
     private BigDecimal discountRate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始领取时间（仅优惠券有值，代金券为null）")
+    private Date beginGetDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束领取时间（仅优惠券有值，代金券为null）")
+    private Date endGetDate;
+
     private List<LifeDiscountCouponFriendRuleDetailVo> lifeDiscountCouponFriendRuleDetailVos;
 }

alien-entity/src/main/java/shop/alien/mapper/LifeDiscountCouponStoreFriendMapper.java

@@ -45,7 +45,9 @@ public interface LifeDiscountCouponStoreFriendMapper extends BaseMapper<LifeDisc
             "1 as type,\n" +
             "null as voucherId,\n" +
             "ldc.coupon_type couponType,\n" +
-            "ldc.discount_rate discountRate\n" +
+            "ldc.discount_rate discountRate,\n" +
+            "ldc.begin_get_date beginGetDate,\n" +
+            "ldc.end_get_date endGetDate\n" +
             "from  life_discount_coupon_store_friend ldcsf\n" +
             "left join life_discount_coupon ldc\n" +
             "on ldc.id = ldcsf.coupon_id and ldc.delete_flag = 0\n" +
@@ -62,7 +64,9 @@ public interface LifeDiscountCouponStoreFriendMapper extends BaseMapper<LifeDisc
             "null couponId,\n" +
             "ldcsf.single_qty couponNum,\n" +
             "4 as type,\n" +
-            "lc.id voucherId\n" +
+            "lc.id voucherId,\n" +
+            "null as beginGetDate,\n" +
+            "null as endGetDate\n" +
             "from life_discount_coupon_store_friend ldcsf\n" +
             "left join life_coupon lc on lc.id = ldcsf.voucher_id and lc.delete_flag = 0\n" +
             "left join store_info si on CAST(si.id AS CHAR) COLLATE utf8mb4_unicode_ci = lc.store_id and si.delete_flag = 0\n" +
@@ -79,7 +83,9 @@ public interface LifeDiscountCouponStoreFriendMapper extends BaseMapper<LifeDisc
             "1 as type,\n" +
             "null as voucherId,\n" +
             "ldc.coupon_type couponType,\n" +
-            "ldc.discount_rate discountRate\n" +
+            "ldc.discount_rate discountRate,\n" +
+            "ldc.begin_get_date beginGetDate,\n" +
+            "ldc.end_get_date endGetDate\n" +
             "from  life_discount_coupon_store_friend ldcsf\n" +
             "left join life_discount_coupon ldc\n" +
             "on ldc.id = ldcsf.coupon_id and ldc.delete_flag = 0\n" +
@@ -98,7 +104,9 @@ public interface LifeDiscountCouponStoreFriendMapper extends BaseMapper<LifeDisc
             "null couponId,\n" +
             "ldcsf.single_qty couponNum,\n" +
             "4 as type,\n" +
-            "lc.id voucherId\n" +
+            "lc.id voucherId,\n" +
+            "null as beginGetDate,\n" +
+            "null as endGetDate\n" +
             "from life_discount_coupon_store_friend ldcsf\n" +
             "left join life_coupon lc on lc.id = ldcsf.voucher_id and lc.delete_flag = 0\n" +
             "left join store_user su\n" +