活动排课

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

@@ -16,7 +16,7 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
      * @Date: 2019/10/1
      * 新增vip课活动方案
      */
-    void addVipGroupActivity(VipGroupActivityAddDto vipGroupActivityAddDto);
+    VipGroupActivityAddDto addVipGroupActivity(VipGroupActivityAddDto vipGroupActivityAddDto);
 
     /**
      * @Author: Joburgess

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

@@ -60,25 +60,28 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
 	@Override
-	public void addVipGroupActivity(VipGroupActivityAddDto vipGroupActivityAddDto) {
+	public VipGroupActivityAddDto addVipGroupActivity(VipGroupActivityAddDto vipGroupActivityAddDto) {
 
 		if(Objects.isNull(vipGroupActivityAddDto.getOrganId())){
 			throw new BizException("请指定部门!");
 		}
 		VipGroupSalarySettlementDto vipGroupSalarySettlement = vipGroupActivityAddDto.getVipGroupSalarySettlement();
-		checkSettlement(vipGroupSalarySettlement.getVipOnlineSalarySettlement());
-		checkSettlement(vipGroupSalarySettlement.getVipOfflineSalarySettlement());
-		checkSettlement(vipGroupSalarySettlement.getGiveVipOnlineSalarySettlement());
-		checkSettlement(vipGroupSalarySettlement.getGiveVipOfflineSalarySettlement());
-		checkSettlement(vipGroupSalarySettlement.getPracticeSalarySettlement());
-		checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());
+		if(vipGroupSalarySettlement != null){
+			checkSettlement(vipGroupSalarySettlement.getVipOnlineSalarySettlement());
+			checkSettlement(vipGroupSalarySettlement.getVipOfflineSalarySettlement());
+			checkSettlement(vipGroupSalarySettlement.getGiveVipOnlineSalarySettlement());
+			checkSettlement(vipGroupSalarySettlement.getGiveVipOfflineSalarySettlement());
+			checkSettlement(vipGroupSalarySettlement.getPracticeSalarySettlement());
+			checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());
+		}
 
 		vipGroupActivityAddDto.setSalarySettlementJson(JSON.toJSONString(vipGroupActivityAddDto.getVipGroupSalarySettlement()));
 		ActivityApplyStudentType applyToStudentType = getApplyToStudentType(vipGroupActivityAddDto.getApplyToStudentType());
-		vipGroupActivityAddDto.setApplyToStudentType(JSONObject.toJSONString(applyToStudentType));
+//		vipGroupActivityAddDto.setApplyToStudentType(JSONObject.toJSONString(applyToStudentType));
 		super.insert(vipGroupActivityAddDto);
 		applyToStudentType.setActivityId(vipGroupActivityAddDto.getId());
 		activityApplyStudentTypeDao.insert(applyToStudentType);
+		return vipGroupActivityAddDto;
 	}
 
 	private ActivityApplyStudentType getApplyToStudentType(String applyToStudentType){
@@ -131,7 +134,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
 		vipGroupActivityAddDto.setSalarySettlementJson(JSON.toJSONString(vipGroupActivityAddDto.getVipGroupSalarySettlement()));
 		ActivityApplyStudentType applyToStudentType = getApplyToStudentType(vipGroupActivityAddDto.getApplyToStudentType());
-		vipGroupActivityAddDto.setApplyToStudentType(JSONObject.toJSONString(applyToStudentType));
+//		vipGroupActivityAddDto.setApplyToStudentType(JSONObject.toJSONString(applyToStudentType));
 		super.update(vipGroupActivityAddDto);
 		applyToStudentType.setActivityId(vipGroupActivityAddDto.getId());
 		activityApplyStudentTypeDao.updateByActivity(applyToStudentType);

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -47,8 +47,7 @@ public class VipGroupActivityController extends BaseController {
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
     public Object addVipGroupActivity(@RequestBody VipGroupActivityAddDto vipGroupActivityAddDto){
-        vipGroupActivityService.addVipGroupActivity(vipGroupActivityAddDto);
-        return succeed();
+        return succeed(vipGroupActivityService.addVipGroupActivity(vipGroupActivityAddDto));
     }
 
     @ApiOperation(value = "分页查询活动方案")

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

@@ -53,8 +53,7 @@ public class VipGroupActivityController extends BaseController {
     @PostMapping("/addVipGroupActivity")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/addVipGroupActivity')")
     public Object addVipGroupActivity(@RequestBody VipGroupActivityAddDto vipGroupActivityAddDto){
-        vipGroupActivityService.addVipGroupActivity(vipGroupActivityAddDto);
-        return succeed();
+        return succeed(vipGroupActivityService.addVipGroupActivity(vipGroupActivityAddDto));
     }
 
     @ApiOperation(value = "分页查询活动方案")