双十一活动

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupType.java

@@ -16,6 +16,7 @@ public enum GroupType implements BaseEnum<String, GroupType> {
 	MAINTENANCE("乐保"),
 	REPLACEMENT("乐器置换"),
 	DEGREE("6.1考级活动"),
+	ACTIVITY("活动购买"),
 	MEMBER("购买会员");
 
 	private String desc;

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

@@ -4190,6 +4190,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
                 activityUserMappers.add(activityUserMapper);
                 times = times + activity.getGivePrizeNum();
+                //是否进入课程余额
+                if(activity.isPayToBalance()){
+                    boolean appendCourseBalance = sysUserCashAccountService.appendCourseBalance(userId, activity.getMarketPrice(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "2021双11活动");
+                    if (!appendCourseBalance) {
+                        throw new BizException("增加用户课程余额失败");
+                    }
+                }
             }
             //赠送抽奖机会
             if(times > 0){
@@ -5680,7 +5687,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         //判断用户是否已存在订单
         // 判断是否存在支付中的记录
-        List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.VIP,null,student.getUserId(),DealStatusEnum.ING,OrderTypeEnum.DOUBLE_ELEVEN2021);
+        List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.ACTIVITY,null,student.getUserId(),DealStatusEnum.ING,OrderTypeEnum.DOUBLE_ELEVEN2021);
         if (list.size() > 0) {
             StudentPaymentOrder order = list.get(0);
             // 查询订单状态
@@ -5730,7 +5737,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setUserId(student.getUserId());
-        studentPaymentOrder.setGroupType(GroupType.VIP);
+        studentPaymentOrder.setGroupType(GroupType.ACTIVITY);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setType(OrderTypeEnum.DOUBLE_ELEVEN2021);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);

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

@@ -128,14 +128,14 @@ public class StudentOrderController extends BaseController {
     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
     @Autowired
     private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
-
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
     private SysCouponCodeDao sysCouponCodeDao;
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
-
+    @Autowired
+    private VipGroupActivityDao vipGroupActivityDao;
     @Autowired
     private SellOrderService sellOrderService;
 
@@ -259,6 +259,8 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("detail", replacementInstrumentActivityDao.getInfo(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
         } 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()));
         } else if (orderByOrderNo.getGroupType().equals(GroupType.MEMBER)) {
             CloudTeacherOrderDto orderDto = cloudTeacherOrderService.queryOrderInfoByOrderId(orderByOrderNo.getId());
             orderDetail.put("detail",orderDto);