소스 검색

双十一活动调整

zouxuan 2 년 전
부모
커밋
30825246eb
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

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

@@ -328,11 +328,11 @@ public class StudentOrderController extends BaseController {
                     vipGroupActivity.setVipGroupCategoryNames(categoryMap.get(vipGroupActivity.getVipGroupCategoryIdList()));
                     vipGroupActivity.setGiveCategoryName(categoryMap.get(vipGroupActivity.getGiveCategoryId()));
                     vipGroupActivityService.setActivityType(vipGroupActivity);
-                    if(orderByOrderNo.getOrganId().equals(4)){
+//                    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()).