学员活动购买

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupActivityService.java

@@ -117,4 +117,6 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
     HttpResponseResult buy(ActivityPayParamDto activityPayParamDto) throws Exception;
 
     void orderCallback(StudentPaymentOrder studentPaymentOrder);
+
+    void setActivityType(VipGroupActivity activity);
 }

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

@@ -612,7 +612,33 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}
 	}
 
-	private void sendSuccessMsg(StudentPaymentOrder studentPaymentOrder){
+    @Override
+    public void setActivityType(VipGroupActivity activity) {
+		//如果是会员活动
+		if(activity.getActivityType().equals(1)){
+			activity.setActivityTypeEnum("MEMBER");
+		}else {
+			if(StringUtils.isEmpty(activity.getVipGroupCategoryIdList())){
+				activity.setActivityTypeEnum("PRACTICE");
+			}else {
+				if(StringUtils.equals(activity.getVipGroupCategoryNames(),"乐理课")){
+					activity.setActivityTypeEnum("THEORY");
+				}else{
+					activity.setActivityTypeEnum(activity.getVipGroupCategoryNames());
+				}
+			}
+		}
+		String giveCourseType = activity.getGiveCourseType();
+		if(StringUtils.isNotEmpty(giveCourseType)){
+			if(StringUtils.equals(giveCourseType,"VIP")){
+				if(StringUtils.equals(activity.getGiveCategoryName(),"乐理课")){
+					activity.setGiveCourseType("THEORY");
+				}
+			}
+		}
+    }
+
+    private void sendSuccessMsg(StudentPaymentOrder studentPaymentOrder){
 		Integer userId = studentPaymentOrder.getUserId();
 		VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(Integer.parseInt(studentPaymentOrder.getActivityId()));
 		String activityName = vipGroupActivity.getName();

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

@@ -148,7 +148,7 @@ public class ActivityController extends BaseController {
         Map<String, String> categoryMap = vipGroupCategoryDao.findConditionCategorys().stream().collect(Collectors.toMap(e-> e.getId().toString(), ConditionDto::getName));
         vipGroupActivity.setVipGroupCategoryNames(categoryMap.get(vipGroupActivity.getVipGroupCategoryIdList()));
         vipGroupActivity.setGiveCategoryName(categoryMap.get(vipGroupActivity.getGiveCategoryId()));
-        this.setActivityType(vipGroupActivity);
+        vipGroupActivityService.setActivityType(vipGroupActivity);
         return succeed(vipGroupActivity);
     }
 
@@ -180,34 +180,9 @@ public class ActivityController extends BaseController {
             for (VipGroupActivity activity : vipGroupActivities) {
                 activity.setVipGroupCategoryNames(categoryMap.get(activity.getVipGroupCategoryIdList()));
                 activity.setGiveCategoryName(categoryMap.get(activity.getGiveCategoryId()));
-                this.setActivityType(activity);
+                vipGroupActivityService.setActivityType(activity);
             }
         }
         return succeed(vipGroupActivities);
     }
-
-    private void setActivityType(VipGroupActivity activity){
-        //如果是会员活动
-        if(activity.getActivityType().equals(1)){
-            activity.setActivityTypeEnum("MEMBER");
-        }else {
-            if(StringUtils.isEmpty(activity.getVipGroupCategoryIdList())){
-                activity.setActivityTypeEnum("PRACTICE");
-            }else {
-                if(StringUtils.equals(activity.getVipGroupCategoryNames(),"乐理课")){
-                    activity.setActivityTypeEnum("THEORY");
-                }else{
-                    activity.setActivityTypeEnum(activity.getVipGroupCategoryNames());
-                }
-            }
-        }
-        String giveCourseType = activity.getGiveCourseType();
-        if(StringUtils.isNotEmpty(giveCourseType)){
-            if(StringUtils.equals(giveCourseType,"VIP")){
-                if(StringUtils.equals(activity.getGiveCategoryName(),"乐理课")){
-                    activity.setGiveCourseType("THEORY");
-                }
-            }
-        }
-    }
 }

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

@@ -89,7 +89,7 @@ public class StudentOrderController extends BaseController {
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
     @Autowired
-    private VipGroupActivityDao vipGroupActivityDao;
+    private VipGroupActivityService vipGroupActivityService;
     @Autowired
     private SellOrderService sellOrderService;
     @Autowired
@@ -102,6 +102,8 @@ public class StudentOrderController extends BaseController {
     private TenantConfigService tenantConfigService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private VipGroupCategoryDao vipGroupCategoryDao;
 
     @Value("${spring.profiles.active:dev}")
     private String profiles;
@@ -283,7 +285,7 @@ public class StudentOrderController extends BaseController {
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             if(orderByOrderNo.getType() == OrderTypeEnum.ACTIVITY){
-                orderDetail.put("activity", vipGroupActivityDao.queryByIds(orderByOrderNo.getActivityId()));
+                orderDetail.put("activity", vipGroupActivityService.getDao().queryByIds(orderByOrderNo.getActivityId()));
             }else if (StringUtils.isNotEmpty(orderByOrderNo.getMusicGroupId())) {
                 VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
                 orderDetail.put("detail", vipBuyResultInfo);
@@ -312,7 +314,16 @@ public class StudentOrderController extends BaseController {
         } else if (orderByOrderNo.getGroupType().equals(GroupType.DEGREE)) {
             orderDetail.put("detail", childrenDayDegreeDetailDao.getByOrderId(orderByOrderNo.getId()));
         } else if (orderByOrderNo.getGroupType().equals(GroupType.ACTIVITY)) {
-            orderDetail.put("detail", vipGroupActivityDao.queryByIds(orderByOrderNo.getActivityId()));
+            List<VipGroupActivity> vipGroupActivities = vipGroupActivityService.getDao().queryByIds(orderByOrderNo.getActivityId());
+            if(CollectionUtils.isNotEmpty(vipGroupActivities)){
+                Map<String, String> categoryMap = vipGroupCategoryDao.findConditionCategorys().stream().collect(Collectors.toMap(e-> e.getId().toString(), ConditionDto::getName));
+                for (VipGroupActivity vipGroupActivity : vipGroupActivities) {
+                    vipGroupActivity.setVipGroupCategoryNames(categoryMap.get(vipGroupActivity.getVipGroupCategoryIdList()));
+                    vipGroupActivity.setGiveCategoryName(categoryMap.get(vipGroupActivity.getGiveCategoryId()));
+                    vipGroupActivityService.setActivityType(vipGroupActivity);
+                }
+            }
+            orderDetail.put("detail", vipGroupActivities);
         } else if (orderByOrderNo.getGroupType().equals(GroupType.MEMBER)) {
             CloudTeacherOrderDto orderDto = cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId());
             orderDetail.put("detail", orderDto);
@@ -322,7 +333,7 @@ public class StudentOrderController extends BaseController {
                 orderDetail.put("couponList", sysCouponCodeDao.querySysCouponUseList(map));
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.LIVE_BUY)) {
-            orderDetail.put("detail", vipGroupActivityDao.queryByIds(orderByOrderNo.getActivityId()));
+            orderDetail.put("detail", vipGroupActivityService.getDao().queryByIds(orderByOrderNo.getActivityId()));
             orderDetail.put("goodsId",orderByOrderNo.getClassGroupId());
         }
         return succeed(orderDetail);