Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java
#	mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java
#	mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java
#	mec-task/src/main/java/com/ym/mec/task/jobs/StopVipGroupWithNoCreateTask.java

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

@@ -4,6 +4,8 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_APPLY_MESSAGE("SMS_APPLY_MESSAGE", "报名通知"),
+    PUSH_STUDENT_VIP_STOP("PUSH_STUDENT_VIP_STOP", "VIP课取消"),
+    PUSH_TEACHER_VIP_STOP("PUSH_TEACHER_VIP_STOP", "VIP课取消"),
     SMS_MUSIC_GROUP_ADD_STUDENT("SMS_MUSIC_GROUP_ADD_STUDENT", "入团通知"),
     SMS_VERIFY_CODE_LOGIN("SMS_VERIFY_CODE_LOGIN", "验证码登录"),
     SMS_PAYMENT_MESSAGE("SMS_PAYMENT_MESSAGE", "缴费通知"),

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

@@ -251,7 +251,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (studentRegistration.getTemporaryCourseFee() != null) {
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
             for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-                if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() != null){
+                if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null){
                     continue;
                 }
                 MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
@@ -264,7 +264,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
                 orderAmount = orderAmount.add(orderDetail.getPrice());
             }
-        } else if (StringUtils.isNoneBlank(registerPayDto.getGoodsGroupIds())) {
+        } else if (studentRegistration.getTemporaryCourseFee() == null && StringUtils.isNoneBlank(registerPayDto.getGoodsGroupIds())) {
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(registerPayDto.getGoodsGroupIds());
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
@@ -400,7 +400,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (studentRegistration.getTemporaryCourseFee() != null) {
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
             for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-                if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() != null){
+                if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null){
                     continue;
                 }
                 MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
@@ -411,7 +411,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 goodsGroups.add(musicGroupSubjectGoodsGroup);
                 orderAmount = orderAmount.add(orderDetail.getPrice());
             }
-        } else if (registerPayDto.getGoodsGroupIds() != null && !registerPayDto.getGoodsGroupIds().equals("")) {
+        } else if (studentRegistration.getTemporaryCourseFee() == null && !registerPayDto.getGoodsGroupIds().equals("")) {
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(registerPayDto.getGoodsGroupIds());
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {

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

@@ -155,6 +155,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         //乐团计划及收费信息
         MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
         musicOneSubjectClassPlan.setFee(studentRegistration.getTemporaryCourseFee());
+        musicOneSubjectClassPlan.setDepositFee(studentRegistration.getTemporaryCourseFee());
 
         //乐团乐器及辅件信息
         List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();

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

@@ -1659,6 +1659,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		for (VipGroup noCreateSuccessVipGroup : noCreateSuccessVipGroups) {
 			List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(noCreateSuccessVipGroup.getId().toString(),
 					OrderTypeEnum.SMALL_CLASS_TO_BUY, DealStatusEnum.SUCCESS);
+			//学生推送消息
+			//老师推送消息
+//			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_STUDENT_VIP_STOP,);
 			for (StudentPaymentOrder studentPaymentOrder:studentPaymentOrders){
 				//生成账户资金明细
 				sysUserCashAccountService.updateCourseBalance(studentPaymentOrder.getUserId(),studentPaymentOrder.getActualAmount());

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -61,7 +61,7 @@ public interface TaskRemoteService {
 	// 更新VIP课程状态至已结束
 	public void updateVipGroupToFinishedStatus();
 
-	//取消达到报名时间仍未达到报名人数的vip课
-	@GetMapping("task/stopVipGroupWithNoCreate")
-	void stopVipGroupWithNoCreate();
+	@GetMapping("task/updateVipGroupToFinishedStatus")
+	// 取消达到报名时间未达到报名人数的vip课
+	public void stopVipGroupWithNoCreate();
 }

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -78,6 +78,6 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 
 	@Override
 	public void stopVipGroupWithNoCreate() {
-		logger.info("取消达到报名时间仍未达到报名人数的vip课调用失败");
+		logger.info("取消达到报名时间未达到报名人数的vip课失败");
 	}
 }

mec-task/src/main/java/com/ym/mec/task/jobs/StopVipGroupWithNoCreateTask.java

@@ -4,18 +4,20 @@ import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-/**
- * @Author Joburgess
- * @Date 2019/12/3
- */
+@Service
 public class StopVipGroupWithNoCreateTask extends BaseTask {
 
-    @Autowired
-    private TaskRemoteService taskRemoteService;
+	@Autowired
+	private TaskRemoteService taskRemoteService;
 
-    @Override
-    public void execute() throws TaskException {
-        taskRemoteService.stopVipGroupWithNoCreate();
-    }
+	/**
+	 * 取消达到报名时间未达到报名人数的vip课
+	 * @throws TaskException
+	 */
+	@Override
+	public void execute() throws TaskException {
+		taskRemoteService.stopVipGroupWithNoCreate();
+	}
 }

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

@@ -221,6 +221,14 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.classGroupSnap(classGroup4MixDto));
     }
 
+    @ApiOperation(value = "调整班级(调整老师，重排课)")
+    @PostMapping("/classGroupUpdate")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupUpdate')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "ClassGroup4MixDto", value = "添加班级结构", required = true, dataType = "String")})
+    public HttpResponseResult classGroupUpdate(@RequestBody ClassGroup4MixDto classGroup4MixDto) throws Exception {
+        return succeed(classGroupService.classGroupUpdate(classGroup4MixDto));
+    }
+
     @ApiOperation(value = "小班报名详情")
     @GetMapping("/highClassGroups")
     @PreAuthorize("@pcs.hasPermissions('classGroup/highClassGroups')")

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

@@ -275,6 +275,13 @@ public class VipGroupManageController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "取消达到报名时间未达到报名人数的vip课")
+    @PostMapping(value = "/stopVipGroupWithNoCreate")
+    public Object stopVipGroupWithNoCreate(){
+        vipGroupService.stopVipGroupWithNoCreate();
+        return succeed();
+    }
+
     @ApiOperation(value = "新增vip课程计划")
     @PostMapping(value = "/appendVipGroupCourseSchedules")
     public Object appendVipGroupCourseSchedules(@RequestBody VipGroupApplyDto vipGroupApplyDto){