+++

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

@@ -45,9 +45,8 @@ public class CandyUserCouponBasicDto implements Serializable {
     private String uid;
     //private String couponId;
     private Integer state;
-    private LocalDateTime bindAt;
     private String redeemCode;
-    private LocalDateTime redeemAt;
+    private LocalDateTime bindAt;
     private LocalDateTime usedAt;
     private String usedFor;
     //private String comment;

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

@@ -36,11 +36,6 @@ public class CandyMgtCoupon implements Serializable {
      */
     private Integer state;
 
-    /**
-     * 领取方式[0-用户输入兑换｜1-发放至用户]
-     */
-    private Integer bindType;
-
     /**
      * 发放量
      */

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

@@ -46,20 +46,15 @@ public class CandyUserCoupon implements Serializable {
      */
     private Integer state;
 
-    /**
-     * 入账时间
-     */
-    private LocalDateTime bindAt;
-
     /**
      * 兑换码
      */
     private String redeemCode;
 
     /**
-     * 兑换时间
+     * 激活时间
      */
-    private LocalDateTime redeemAt;
+    private LocalDateTime bindAt;
 
     /**
      * 使用时间

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyUserCouponMapper.xml

@@ -34,9 +34,8 @@
         <result column="uid" jdbcType="VARCHAR" property="uid"/>
         <!--        <result column="coupon_id" jdbcType="VARCHAR" property="couponId" />-->
         <result column="state" jdbcType="TINYINT" property="state"/>
-        <result column="bind_at" jdbcType="TIMESTAMP" property="bindAt"/>
         <result column="redeem_code" jdbcType="VARCHAR" property="redeemCode"/>
-        <result column="redeem_at" jdbcType="TIMESTAMP" property="redeemAt"/>
+        <result column="bind_at" jdbcType="TIMESTAMP" property="bindAt"/>
         <result column="used_at" jdbcType="TIMESTAMP" property="usedAt"/>
         <result column="used_for" jdbcType="VARCHAR" property="usedFor"/>
         <!--        <result column="comment" jdbcType="VARCHAR" property="comment" />-->

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

@@ -113,9 +113,8 @@ create table candy_user_coupon
     coupon_id   varchar(64) not null comment '~candy_coupon.coupon_id',
     state       tinyint comment '用户券状态[1-可用|2-无效｜3-已过期｜5-已使用]',
 
-    bind_at     datetime(3) comment '入账时间',
     redeem_code varchar(64) comment '兑换码',
-    redeem_at   datetime(3) comment '兑换时间',
+    bind_at     datetime(3) comment '激活时间',
     used_at     datetime(3) comment '使用时间',
     used_for    varchar(255) comment '用于记录购买的内容',
     comment     varchar(255)