集点活动表增加活动年

share-system/src/main/java/share/system/domain/PointActivities.java

@@ -60,9 +60,15 @@ public class PointActivities extends BaseEntity {
     private Date lastConsumptionTime;
 
     /**
-     * 当前活动月份
+     * 当前活动年
      */
-    @Excel(name = "当前活动月份")
+    @Excel(name = "当前活动年")
+    private Integer currentYear;
+
+    /**
+     * 当前活动月
+     */
+    @Excel(name = "当前活动月")
     private Integer currentMonth;
 
     /**

share-system/src/main/java/share/system/domain/vo/PointActivitiesVo.java

@@ -63,9 +63,15 @@ public class PointActivitiesVo extends BaseEntity {
     private Date lastConsumptionTime;
 
     /**
-     * 当前活动月份
+     * 当前活动年
      */
-    @Excel(name = "当前活动月份")
+    @Excel(name = "当前活动年")
+    private Integer currentYear;
+
+    /**
+     * 当前活动月
+     */
+    @Excel(name = "当前活动月")
     private Integer currentMonth;
 
     /**

share-system/src/main/java/share/system/service/impl/PointActivitiesServiceImpl.java

@@ -107,8 +107,9 @@ public class PointActivitiesServiceImpl extends ServiceImpl<PointActivitiesMappe
             pointActivities.setLastConsumptionTime(sOrder.getPayTime());
             pointActivities.setIsReceive(YesNoEnum.no.getIndex());
             pointActivities.setCouponReceived(YesNoEnum.no.getIndex());
-            LocalDate currentDate = LocalDate.now();
-            pointActivities.setCurrentMonth(currentDate.getMonthValue());
+            //获取当前年月
+            pointActivities.setCurrentYear(LocalDate.now().getYear());
+            pointActivities.setCurrentMonth(LocalDate.now().getMonthValue());
             save(pointActivities);
         }
     }
@@ -121,7 +122,7 @@ public class PointActivitiesServiceImpl extends ServiceImpl<PointActivitiesMappe
         //领取的时间小于领取期限（最后的时间加领取的期限）
         if (DateUtils.addDays(pointActivities.getLastConsumptionTime(), activitiesConf.getCollectionDeadline()).compareTo(new Date()) < 0
                 && pointActivities.getPoints().equals(activitiesConf.getPointsRequired())) {
-            if (pointActivities.getCurrentMonth().compareTo(LocalDate.now().getMonthValue()) == 0) {
+            if (pointActivities.getCurrentMonth().compareTo(LocalDate.now().getMonthValue()) == 0 && pointActivities.getCurrentYear().compareTo(LocalDate.now().getYear()) == 0) {
                 pointActivities.setCouponReceived(YesNoEnum.yes.getIndex());
                 pointActivities.setReceivedDate(new Date());
                 sConsumerCouponService.give(pointActivities.getConsumerId(), activitiesConf.getCouponId(), activitiesConf.getCouponDuration());

share-system/src/main/resources/mapper/system/PointActivitiesMapper.xml

@@ -15,6 +15,7 @@
         <result property="couponId" column="coupon_id"/>
         <result property="couponName" column="coupon_name"/>
         <result property="points" column="points"/>
+        <result property="currentYear" column="current_year"/>
         <result property="currentMonth" column="current_month"/>
         <result property="lastConsumptionTime" column="last_consumption_time"/>
         <result property="isReceive" column="is_receive"/>
@@ -35,6 +36,7 @@
                conf_id,
                coupon_id,
                points,
+               current_year,
                current_month,
                last_consumption_time,
                is_receive,
@@ -62,6 +64,7 @@
         p.coupon_id,
         c1.name as 'coupon_name',
         p.points,
+        p.current_year,
         p.current_month,
         p.last_consumption_time,
         p.is_receive,
@@ -85,6 +88,7 @@
             <if test="confId != null ">and p.conf_id = #{confId}</if>
             <if test="couponId != null ">and p.coupon_id = #{couponId}</if>
             <if test="points != null ">and p.points = #{points}</if>
+            <if test="currentYear != null">and p.current_year = #{currentYear}</if>
             <if test="currentMonth != null">and p.current_month = #{currentMonth}</if>
             <if test="lastConsumptionTime != null ">and p.last_consumption_time = #{lastConsumptionTime}</if>
             <if test="isReceive != null ">and p.is_receive = #{isReceive}</if>
@@ -108,6 +112,7 @@
             <if test="confId != null">conf_id,</if>
             <if test="couponId != null">coupon_id,</if>
             <if test="points != null">points,</if>
+            <if test="currentYear != null">current_year,</if>
             <if test="currentMonth != null">current_month,</if>
             <if test="lastConsumptionTime != null">last_consumption_time,</if>
             <if test="isReceive != null">is_receive,</if>
@@ -126,6 +131,7 @@
             <if test="confId != null">#{confId},</if>
             <if test="couponId != null">#{couponId},</if>
             <if test="points != null">#{points},</if>
+            <if test="currentYear != null">#{currentYear},</if>
             <if test="currentMonth != null">#{currentMonth},</if>
             <if test="lastConsumptionTime != null">#{lastConsumptionTime},</if>
             <if test="isReceive != null">#{isReceive},</if>
@@ -148,6 +154,7 @@
             <if test="confId != null">conf_id = #{confId},</if>
             <if test="couponId != null">coupon_id = #{couponId},</if>
             <if test="points != null">points = #{points},</if>
+            <if test="currentYear != null">current_year = #{currentYear},</if>
             <if test="currentMonth != null">current_month = #{currentMonth},</if>
             <if test="lastConsumptionTime != null">last_consumption_time = #{lastConsumptionTime},</if>
             <if test="isReceive != null">is_receive = #{isReceive},</if>