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

docu/member_voucher_refund.sql

@@ -37,7 +37,7 @@ create table candy_mgt_coupon
 
 #     bind_type   smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
     event_amt   int comment '发放量',
-    event_type  tinyint comment '发放类型[10-全体用户｜1-会员｜2-手机号]',
+    event_type  tinyint comment '发放类型[1-会员｜2-手机号|10-全体用户]',
     event_limit text comment '`发放类型`为2-手机号时发放手机号以,分隔',
     event_at    datetime(3) comment '发放时间(立即-当前时间+3分钟｜预约-点选时间)',
 
@@ -62,7 +62,7 @@ create table candy_coupon
     label           varchar(50) comment '标注',
     notice          varchar(200) comment '注意/须知',
     exclusive       smallint comment '专享标识[0-常规｜1-会员礼包]',
-    busi_type       smallint comment '业务类别[0-全场｜1-演出｜2-商品｜3-优先购|4-会员]',
+    busi_type       smallint comment '业务类别[0-全场｜1-演出｜2-商品｜3-优先购]',
     cou_type        smallint comment '券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]',
     bind_type       smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
 

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/constant/CandyRedisConst.java

@@ -2,7 +2,31 @@ package com.liquidnet.service.candy.constant;
 
 public class CandyRedisConst {
     public static final String PREFIX = "candy:";
-
-    public static final String BASIC_USER_COUPON = PREFIX.concat("basic:user_coupon:");
+    /**
+     * <key>
+     *     candy:basic:coupon_info:${coupon_id}
+     * </key>
+     * <value>
+     *     com.liquidnet.service.candy.dto.CandyCouponInfoDto
+     * </value>
+     */
+    public static final String BASIC_COUPON_INFO = PREFIX.concat("basic:coupon_info:");
+    /**
+     * <key>
+     *     candy:basic:coupon_code:${ccode}
+     * </key>
+     * <value>
+     *     com.liquidnet.service.candy.dto.CandyCouponCodeDto
+     * </value>
+     */
     public static final String BASIC_COUPON_CODE = PREFIX.concat("basic:coupon_code:");
+    /**
+     * <key>
+     *     candy:basic:user_coupon:${uid}
+     * </key>
+     * <value>
+     *     List<com.liquidnet.service.candy.dto.CandyUserCouponBasicDto>
+     * </value>
+     */
+    public static final String BASIC_USER_COUPON = PREFIX.concat("basic:user_coupon:");
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyCouponCodeDto.java

+package com.liquidnet.service.candy.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CandyCouponCodeDto implements Serializable {
+    private static final long serialVersionUID = -1303435376362293086L;
+    private String ccode;
+    private String couponId;
+    private Integer state;
+//    private String redeemUid;
+//    private String redeemMobile;
+//    private LocalDateTime redeemAt;
+//    private LocalDateTime createdAt;
+//    private LocalDateTime updatedAt;
+//    private String comment;
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyCouponInfoDto.java

+package com.liquidnet.service.candy.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class CandyCouponInfoDto implements Serializable {
+    private static final long serialVersionUID = -8168720454784368068L;
+    /* com.liquidnet.service.candy.entity.CandyCoupon */
+    private String couponId;
+    private Integer state;
+    private String title;
+    private String label;
+    private String notice;
+    private Integer exclusive;
+    private Integer busiType;
+    private Integer couType;
+    private Integer bindType;
+    private BigDecimal discount;
+    private BigDecimal valFace;
+    private BigDecimal valOver;
+    private BigDecimal valMinus;
+    private Integer overlay;
+    private Integer overlayLevel;
+    private Integer validity;
+    private Integer redeemValidity;
+    private LocalDateTime redeemStart;
+    private LocalDateTime redeemStop;
+    private LocalDateTime effectAt;
+    private LocalDateTime expireAt;
+    //private String operator;
+    //private LocalDateTime createdAt;
+    //private LocalDateTime updatedAt;
+    //private String comment;
+
+
+    /* com.liquidnet.service.candy.entity.CandyCouponRule */
+    private List<CandyCouponRuleDto> useRules;
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyCouponRuleDto.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-public class CandyCouponRuleDto implements Serializable,Cloneable {
+public class CandyCouponRuleDto implements Serializable, Cloneable {
     private static final long serialVersionUID = -3727352492315559906L;
 
     private String cruleId;
@@ -17,12 +17,12 @@ public class CandyCouponRuleDto implements Serializable,Cloneable {
     //private String comment;
 
     private static final CandyCouponRuleDto obj = new CandyCouponRuleDto();
+
     public static CandyCouponRuleDto getNew() {
         try {
             return (CandyCouponRuleDto) obj.clone();
         } catch (CloneNotSupportedException e) {
-            e.printStackTrace();
+            return new CandyCouponRuleDto();
         }
-        return new CandyCouponRuleDto();
     }
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponListParam.java

@@ -17,7 +17,7 @@ public class CandyMgtCouponListParam {
      */
     private Integer bindType;
     /**
-     * 业务类别[0-全场｜1-演出｜2-商品｜3-优先购|4-会员]
+     * 业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
      */
     private Integer busiType;
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCoupon.java

@@ -55,7 +55,7 @@ public class CandyCoupon implements Serializable {
     private Integer exclusive;
 
     /**
-     * 业务类别[0-全场｜1-演出｜2-商品｜3-优先购|4-会员]
+     * 业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
      */
     private Integer busiType;
 

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql

@@ -12,7 +12,7 @@ create table candy_mgt_coupon
 
 #     bind_type   smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
     event_amt   int comment '发放量',
-    event_type  tinyint comment '发放类型[10-全体用户｜1-会员｜2-手机号]',
+    event_type  tinyint comment '发放类型[1-会员｜2-手机号|10-全体用户]',
     event_limit text comment '`发放类型`为2-手机号时发放手机号以,分隔',
     event_at    datetime(3) comment '发放时间(立即-当前时间+3分钟｜预约-点选时间)',
 
@@ -37,7 +37,7 @@ create table candy_coupon
     label           varchar(50) comment '标注',
     notice          varchar(200) comment '注意/须知',
     exclusive       smallint comment '专享标识[0-常规｜1-会员礼包]',
-    busi_type       smallint comment '业务类别[0-全场｜1-演出｜2-商品｜3-优先购|4-会员]',
+    busi_type       smallint comment '业务类别[0-全场｜1-演出｜2-商品｜3-优先购]',
     cou_type        smallint comment '券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]',
     bind_type       smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
 

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/vo/CandyCouponVo.java

@@ -18,7 +18,7 @@ public class CandyCouponVo implements Serializable,Cloneable {
     private String label;//标注
     private String notice;//须知
 //    private Integer exclusive;//专享标识[0-常规｜1-会员礼包]
-//    private Integer busiType;//业务类别[0-全场｜1-演出｜2-商品｜3-优先购|4-会员]
+//    private Integer busiType;//业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
     private Integer couType;//券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]
     private Integer bindType;//[0-用户输入兑换｜1-发放至用户]
     private BigDecimal discount;//折扣