Merge branch 'dev' into 'mp-server-test'

增加券码

See merge request quanshu/mp-server!235

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelCouponVerifyLog.java

@@ -39,6 +39,12 @@ public class ChannelCouponVerifyLog implements Serializable {
   @TableField("user_coupon_id")
   private String userCouponId;
 
+  /**
+   * 券码
+   */
+  @TableField("verify_code")
+  private String verifyCode;
+
   /**
    * 优惠类型;1代金券、2折扣券、3兑换券
    */

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCouponVerifyLogServiceImpl.java

@@ -64,6 +64,7 @@ public class ChannelCouponVerifyLogServiceImpl extends ServiceImpl<ChannelCoupon
     ChannelCouponVerifyLog verifyLog = new ChannelCouponVerifyLog();
     verifyLog.setChannelId(channelId);
     verifyLog.setUserCouponId(userCoupon.getId());
+    verifyLog.setVerifyCode(userCoupon.getVerifyCode());
     verifyLog.setDiscountType(coupon.getDiscountType());
     verifyLog.setDiscount(coupon.getDiscount());
     verifyLog.setDistributeTime(userCoupon.getCreatedTime());

mp-service/src/main/resources/mapper/channel/ChannelCouponVerifyLogMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="channel_id" property="channelId" />
         <result column="user_coupon_id" property="userCouponId" />
+        <result column="verify_code" property="verifyCode" />
         <result column="discount_type" property="discountType" />
         <result column="discount" property="discount" />
         <result column="distribute_time" property="distributeTime" />
@@ -20,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, channel_id, user_coupon_id, discount_type, discount, distribute_time, valid_start, valid_end, verify_time, settle_status, created_time, updated_time
+        id, channel_id, user_coupon_id, verify_code, discount_type, discount, distribute_time, valid_start, valid_end, verify_time, settle_status, created_time, updated_time
     </sql>
 
 </mapper>