双十一活动,规则改动

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -4166,6 +4166,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             BigDecimal subCouponRemitFee = couponRemitFee;
             BigDecimal totalMarketPrice = vipGroupActivities.stream().map(e -> e.getMarketPrice()).reduce(ZERO, BigDecimal::add);
 
+            String startTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
+            Date startTime = DateUtil.stringToDate(startTimeStr);
+            String endTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
+            Date endTime = DateUtil.stringToDate(endTimeStr);
             for (int i = 0; i < vipGroupActivities.size(); i++) {
                 VipGroupActivity activity = vipGroupActivities.get(i);
                 ActivityUserMapper activityUserMapper = new ActivityUserMapper();
@@ -4197,10 +4201,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                         throw new BizException("增加用户课程余额失败");
                     }
                 }
+                if(!activity.getCode().equals(5)){
+                    if (order.getCreateTime().compareTo(startTime) >= 0 && order.getCreateTime().compareTo(endTime) <= 0 ) {
+                        //赠送一次抽奖机会
+                        luckDrawCountService.freeGive(order.getUserId().longValue(),1,2);
+                    }
+                }
             }
             //赠送抽奖机会
             if(times > 0){
-                luckDrawCountService.freeGive(order.getUserId().longValue(),times,13);
+                luckDrawCountService.freeGive(order.getUserId().longValue(),times,2);
             }
             activityUserMapperService.batchInsert(activityUserMappers);
 
@@ -4248,10 +4258,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             String memberKey = "2021_double_eleven" + order.getUserId();
             Boolean aBoolean = redisCache.exists(memberKey);
             if(!aBoolean){
-                String startTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
-                Date startTime = DateUtil.stringToDate(startTimeStr);
-                String endTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
-                Date endTime = DateUtil.stringToDate(endTimeStr);
                 if (order.getCreateTime().compareTo(startTime) >= 0 && order.getCreateTime().compareTo(endTime) <= 0 ) {
                     //赠送会员
                     CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
@@ -4262,7 +4268,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                         addDate = student.getMembershipEndTime();
                         cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
                     }
-                    cloudTeacherOrder.setEndTime(DateUtil.addMonths(addDate, 1));
+                    cloudTeacherOrder.setEndTime(DateUtil.addDays(DateUtil.addMonths(addDate, 1),1));
                     cloudTeacherOrder.setRemark("双十一活动赠送会员");
                     cloudTeacherOrder.setStatus(2);
                     cloudTeacherOrder.setOrderId(order.getId());