双十一活动

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

@@ -1,6 +1,7 @@
 package com.ym.mec.student.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.AdapayCore;
 import com.huifu.adapay.core.util.AdapaySign;
@@ -318,18 +319,32 @@ public class StudentOrderController extends BaseController {
         } else if (orderByOrderNo.getGroupType().equals(GroupType.ACTIVITY)) {
             List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.getDao().queryByIds(orderByOrderNo.getActivityId());
             if(CollectionUtils.isNotEmpty(vipGroupActivities)){
+                String activeConfig = sysConfigDao.findConfigValue("2022_double_eleven_give_config");
                 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);
+                    List<SysConfigJsonDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, SysConfigJsonDto.class);
+                    List<SysConfigJsonDto> activityDtos = cloud2022ActivityDtos.stream().
+                            filter(e -> Arrays.stream(e.getKey().split(",")).collect(Collectors.toList()).
+                                    contains(vipGroupActivity.getId().toString())).collect(Collectors.toList());
+                    if(CollectionUtils.isNotEmpty(activityDtos)){
+                        SysConfigJsonDto jsonDto = activityDtos.get(0);
+                        drawTimes += Integer.parseInt(jsonDto.getValue());
+                    }
                 }
+                TempBuyDoubleElevenUserLog doubleElevenUserLog = tempBuyDoubleElevenUserLogDao.findByOrderId(orderByOrderNo.getId());
+                if(Objects.nonNull(doubleElevenUserLog) && doubleElevenUserLog.isGiveFlag()){
+                    VipGroupActivity vipGroupActivity = new VipGroupActivity();
+                    vipGroupActivity.setName("乐器清洁保养服务1次");
+                    vipGroupActivities.add(vipGroupActivity);
+                }
+                LuckDrawCount luckDrawCount = luckDrawCountService.get(orderByOrderNo.getUserId().longValue());
+                orderDetail.put("drawTimes",drawTimes);
             }
             orderDetail.put("detail", vipGroupActivities);
-            TempBuyDoubleElevenUserLog doubleElevenUserLog = tempBuyDoubleElevenUserLogDao.findByOrderId(orderByOrderNo.getId());
-            if(Objects.nonNull(doubleElevenUserLog) && doubleElevenUserLog.isGiveFlag()){
-                orderDetail.put("giveDetail", "乐器清洁保养服务1次");
-            }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.MEMBER)) {
             CloudTeacherOrderDto orderDto = cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId());
             orderDetail.put("detail", orderDto);