领取活动

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseAddBo.java

@@ -32,10 +32,14 @@ public class ActivityConfigurationUseAddBo {
     private Integer activityType;
     /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
     @ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-    private Integer use;
+    private Integer useStatus;
 
     /** 领取时间 */
     @ApiModelProperty("领取时间")
     private Long createTime;
 
+    /** 领取时间 */
+    @ApiModelProperty("领取时间")
+    private Long updateTime;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseEditBo.java

@@ -32,7 +32,7 @@ public class ActivityConfigurationUseEditBo {
 
     /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
     @ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-    private Integer use;
+    private Integer useStatus;
 
     /** 领取时间 */
     @ApiModelProperty("领取时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseQueryBo.java

@@ -41,7 +41,7 @@ public class ActivityConfigurationUseQueryBo extends BaseEntity {
 	private Integer activityType;
 	/** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
 	@ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	private Integer use;
+	private Integer useStatus;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfigurationUse.java

@@ -34,9 +34,12 @@ private static final long serialVersionUID=1L;
     private Integer activityType;
 
     /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-    private Integer use;
+    private Integer useStatus;
 
     /** 领取时间 */
     private Long createTime;
 
+    /** 领取时间 */
+    private Long updateTime;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.activity.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
 import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
@@ -54,7 +55,7 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
     public List<ActivityConfigurationUseVo> queryList(ActivityConfigurationUseQueryBo bo) {
         LambdaQueryWrapper<ActivityConfigurationUse> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getActivityType() != null, ActivityConfigurationUse::getActivityType, bo.getActivityType());
-        lqw.eq(bo.getUse() != null, ActivityConfigurationUse::getUse, bo.getUse());
+        lqw.eq(bo.getUseStatus() != null, ActivityConfigurationUse::getUseStatus, bo.getUseStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -82,6 +83,8 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
     public Boolean insertByAddBo(ActivityConfigurationUseAddBo bo) {
         ActivityConfigurationUse add = BeanUtil.toBean(bo, ActivityConfigurationUse.class);
         validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);
     }
 
@@ -132,11 +135,11 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
             case 4:
             case 2:
             case 5:
-                bo.setUse(1);
+                bo.setUseStatus(1);
                 break;
             //向卡券表中生成优惠券或折扣券
             default:
-                bo.setUse(0);
+                bo.setUseStatus(0);
                 CouponAddBo couponAddBo = new CouponAddBo();
                 couponAddBo.setPrice(activityConfigurationVo.getPrice());
                 couponAddBo.setEndTime(afterSixMonthDate(new Date(),activityConfigurationVo.getCouponEnd()));
@@ -167,7 +170,7 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         c.setTime(currentDate);
         c.add(Calendar.MONTH, amount);
         Date m3 = c.getTime();
-        return m3.getTime();
+        return m3.getTime()/1000;
     }
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationUseVo.java

@@ -31,7 +31,7 @@ public class ActivityConfigurationUseVo {
 	/** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
 	@Excel(name = "是否已使用该次活动   0未使用  1已使用   线上直播 3")
 	@ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	private Integer use;
+	private Integer useStatus;
 
 	/** 领取时间 */
 	@Excel(name = "领取时间")

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="activityLogo" column="activity_logo"/>
         <result property="activityUrl" column="activity_url"/>
+        <result property="couponEnd" column="coupon_end"/>
         <result property="status" column="status"/>
     </resultMap>
 
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="activityLogo" column="activity_logo"/>
         <result property="activityUrl" column="activity_url"/>
+        <result property="couponEnd" column="coupon_end"/>
         <collection property="courses" javaType="java.util.List" resultMap="CourseResult"/>
     </resultMap>
 

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationUseMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId" column="user_id"/>
         <result property="configurationId" column="configuration_id"/>
         <result property="activityType" column="activity_type"/>
-        <result property="use" column="use"/>
+        <result property="useStatus" column="useStatus"/>
         <result property="createTime" column="create_time"/>
     </resultMap>