活动排课

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupBuyParamsDto.java

@@ -32,6 +32,17 @@ public class PracticeGroupBuyParamsDto {
 
     private Integer organId;
 
+    @ApiModelProperty(value = "购买的会员数量")
+    private Integer buyMemberNum;
+
+    public Integer getBuyMemberNum() {
+        return buyMemberNum;
+    }
+
+    public void setBuyMemberNum(Integer buyMemberNum) {
+        this.buyMemberNum = buyMemberNum;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -5016,6 +5016,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrder.setOrganId(practiceGroup.getOrganId());
         studentPaymentOrder.setVersion(0);
         studentPaymentOrder.setActivityId(practiceGroup.getVipGroupActivityId());
+        studentPaymentOrder.setActivityBuyNum(practiceGroup.getAllCourseNum());
         studentPaymentOrderDao.insert(studentPaymentOrder);
 
         BigDecimal amount=studentPaymentOrder.getActualAmount();
@@ -5116,7 +5117,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
         GroupType groupType;
+        Integer buyNum = activity.getMinCourseNum();
         if(activity.getActivityType() == 1){
+            buyNum = practiceGroupBuyParams.getBuyMemberNum();
             groupType = GroupType.MEMBER;
         }else {
             if(activity.getCourseType().equals("VIP")){
@@ -5193,6 +5196,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrder.setCreateTime(nowDate);
         studentPaymentOrder.setUpdateTime(nowDate);
         studentPaymentOrder.setActivityId(activityId);
+        studentPaymentOrder.setActivityBuyNum(buyNum);
         studentPaymentOrderService.update(studentPaymentOrder);
 
         studentPaymentOrder.setVersion(0);

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

@@ -2729,6 +2729,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentPaymentOrder.setClassGroupId(classGroup.getId());
 		studentPaymentOrder.setOrganId(vipGroup.getOrganId());
 		studentPaymentOrder.setVersion(0);
+		studentPaymentOrder.setActivityBuyNum(vipGroup.getOnlineClassesNum() + vipGroup.getOfflineClassesNum());
 		studentPaymentOrder.setActivityId(vipGroup.getVipGroupActivityId());
 		studentPaymentOrderDao.insert(studentPaymentOrder);