Merge branch 'master_position' into dev

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/UserCouponDTO.java

@@ -25,6 +25,9 @@ public class UserCouponDTO {
     @ApiModelProperty(value = "抵扣金额")
     private BigDecimal usedAmount;
 
+    @ApiModelProperty(value = "时效")
+    private Integer validType;
+
     @ApiModelProperty(value = "0-未使用；1-已使用")
     private Integer isUse;
 

xx-activity/xx-activity-server/src/main/resources/mapper/UserCouponMapper.xml

@@ -82,6 +82,7 @@
         uc.is_use AS `isUse`,
         cp.title,
         cp.used_amount AS `usedAmount`,
+        cp.valid_type AS `validType`,
         uc.crt_time AS `crtTime`,
         uc.expire_time AS `expireTime`,
         uc.use_time AS `useTime`
@@ -94,7 +95,7 @@
         <if test="status != null">
            AND  `is_use`=#{status}
         </if>) AS `uc`
-        INNER JOIN ( SELECT `id`, `title`, `used_amount` FROM `coupon` WHERE 1=1
+        INNER JOIN ( SELECT `id`, `title`, `used_amount`,`valid_type` FROM `coupon` WHERE 1=1
         <if test="couponId != null">
             AND `id`=#{couponId}
         </if>