乐团相关缴费云教练全部手动激活

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
 import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.biz.dal.enums.TenantOrderRecordEnum;
@@ -283,7 +284,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         cloudTeacherOrder.setStudentId(order.getUserId());
         cloudTeacherOrder.setStatus(1);
         //保存云教练订单
-        this.save(cloudTeacherOrder,calenderMember.getAutoActivationFlag());
+        this.save(cloudTeacherOrder,order.getGroupType() == GroupType.MUSIC ? false:calenderMember.getAutoActivationFlag());
     }
 
     @Override

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

@@ -694,7 +694,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             cloudTeacherOrder.setStudentId(studentPaymentOrder.getUserId());
             cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
             cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
-            cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
+            cloudTeacherOrderService.save(cloudTeacherOrder,studentPaymentOrder.getGroupType() == GroupType.MUSIC ? false:tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
             //赠送陪练课
             ActivityUserMapper activityUserMapper = new ActivityUserMapper();
             activityUserMapper.setTeacherId(student.getTeacherId());
@@ -796,7 +796,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setStudentId(studentPaymentOrder.getUserId());
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
-                cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
+                cloudTeacherOrderService.save(cloudTeacherOrder,studentPaymentOrder.getGroupType() == GroupType.MUSIC?false:tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
                 //赠送陪练课
 //                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
 //                activityUserMapper.setTeacherId(student.getTeacherId());
@@ -876,7 +876,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                         cloudTeacherOrder.setStudentId(coachPaymentDetails.getUserId());
                         cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                         cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
-                        cloudTeacherOrderService.save(cloudTeacherOrder,cloudCoachPaymentProgram.getAutoActivationFlag());
+                        cloudTeacherOrderService.save(cloudTeacherOrder,studentPaymentOrder.getGroupType() == GroupType.MUSIC?false:cloudCoachPaymentProgram.getAutoActivationFlag());
 
                         //修改缴费状态
                         coachPaymentDetails.setPaymentStatus(1);
@@ -896,7 +896,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                         if(cloudTeacherOrder.getStatus() == 1){
                             throw new BizException("该云教练订单已经支付");
                         }
-                        cloudTeacherOrderService.save(cloudTeacherOrder,true);
+                        cloudTeacherOrderService.save(cloudTeacherOrder,studentPaymentOrder.getGroupType() == GroupType.MUSIC?false:true);
                     }
                 }
             }

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.page.ArrearageStudentsQueryInfo;
@@ -280,7 +281,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
                     cloudTeacherOrder.setStatus(1);
                     cloudTeacherOrder.setRemark("缴费项目0元新增学员");
                     cloudTeacherOrder.setMusicGroupId(musicGroupId);
-                    cloudTeacherOrderService.save(cloudTeacherOrder, calenderMember.getAutoActivationFlag());
+                    cloudTeacherOrderService.save(cloudTeacherOrder,false);
                 }
                 //添加小课包
                 if (calenderActivities != null && calenderActivities.size() > 0) {

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

@@ -742,7 +742,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                         cloudTeacherOrder.setStatus(1);
                         cloudTeacherOrder.setRemark("进行中乐团0元加学生");
                         cloudTeacherOrder.setMusicGroupId(musicGroup.getId());
-                        cloudTeacherOrderService.save(cloudTeacherOrder,calenderMember.getAutoActivationFlag());
+                        cloudTeacherOrderService.save(cloudTeacherOrder,false);
                     }
                     //添加小课包
                     if (calenderActivities != null && calenderActivities.size() > 0) {

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

@@ -814,7 +814,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 cloudTeacherOrder.setType(activity.getGivePeriodEnum());
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setTime(activity.getGiveMemberTime());
-                cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
+                cloudTeacherOrderService.save(cloudTeacherOrder,studentPaymentOrder.getGroupType() == GroupType.MUSIC?false:tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
                 // 添加会员有效时长
                 activityUserMapper.setGiveMemberFlag(2);
                 activityUserMapper.setGiveMemberOrderId(cloudTeacherOrder.getId());

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -409,16 +409,16 @@ public class VipGroupManageController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "获取学生指定vip课的剩余课时费用")
-    @GetMapping(value = "/getStudentSurplusCourseFee")
-    public Object getStudentSurplusCourseFee(Long vipGroupId, Integer studentId){
-        return succeed(vipGroupService.getStudentSurplusCourseFee(vipGroupId,studentId));
-    }
-
-
 //    @ApiOperation(value = "获取学生指定vip课的剩余课时费用")
-//    @PostMapping(value = "/getStudentSurplusCourseFee")
-//    public HttpResponseResult<List<SurplusCourseFeeDto>> getStudentSurplusCourseFee(@RequestBody SurplusCourseFeeDto feeDto){
-//        return succeed(vipGroupService.getStudentSurplusCourseFee1(feeDto));
+//    @GetMapping(value = "/getStudentSurplusCourseFee")
+//    public Object getStudentSurplusCourseFee(Long vipGroupId, Integer studentId){
+//        return succeed(vipGroupService.getStudentSurplusCourseFee(vipGroupId,studentId));
 //    }
+
+
+    @ApiOperation(value = "获取学生指定vip课的剩余课时费用")
+    @PostMapping(value = "/getStudentSurplusCourseFee")
+    public HttpResponseResult<List<SurplusCourseFeeDto>> getStudentSurplusCourseFee(@RequestBody SurplusCourseFeeDto feeDto){
+        return succeed(vipGroupService.getStudentSurplusCourseFee1(feeDto));
+    }
 }