双十一活动

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -320,12 +320,19 @@ public class StudentOrderController extends BaseController {
             List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.getDao().queryByIds(orderByOrderNo.getActivityId());
             if(CollectionUtils.isNotEmpty(vipGroupActivities)){
                 String activeConfig = sysConfigDao.findConfigValue("2022_double_eleven_give_config");
+                String giveStartTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
+                String giveEndTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
                 Map<String, String> categoryMap = vipGroupCategoryDao.findConditionCategorys().stream().collect(Collectors.toMap(e-> e.getId().toString(), ConditionDto::getName));
                 Integer drawTimes = 0;
                 for (VipGroupActivity vipGroupActivity : vipGroupActivities) {
                     vipGroupActivity.setVipGroupCategoryNames(categoryMap.get(vipGroupActivity.getVipGroupCategoryIdList()));
                     vipGroupActivity.setGiveCategoryName(categoryMap.get(vipGroupActivity.getGiveCategoryId()));
                     vipGroupActivityService.setActivityType(vipGroupActivity);
+                    if(orderByOrderNo.getOrganId().equals(4)){
+                        if(!DateUtil.contents(giveStartTime,giveEndTime,orderByOrderNo.getPayTime() == null?orderByOrderNo.getCreateTime():orderByOrderNo.getPayTime())){
+                            continue;
+                        }
+                    }
                     List<SysConfigJsonDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, SysConfigJsonDto.class);
                     List<SysConfigJsonDto> activityDtos = cloud2022ActivityDtos.stream().
                             filter(e -> Arrays.stream(e.getKey().split(",")).collect(Collectors.toList()).
@@ -341,7 +348,6 @@ public class StudentOrderController extends BaseController {
                     vipGroupActivity.setName("乐器清洁保养服务1次");
                     vipGroupActivities.add(vipGroupActivity);
                 }
-                LuckDrawCount luckDrawCount = luckDrawCountService.get(orderByOrderNo.getUserId().longValue());
                 orderDetail.put("drawTimes",drawTimes);
             }
             orderDetail.put("detail", vipGroupActivities);