Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/student/controller/TempDirectorTrainingCampController.java

@@ -56,7 +56,7 @@ public class TempDirectorTrainingCampController extends BaseController {
 
     @ApiOperation(value="训练营报名")
     @PostMapping(value = "/applyCamp")
-    public HttpResponseResult<Integer> applyCamp(@Valid @RequestBody TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp){
+    public HttpResponseResult<TempDirectorTrainingCampDetailWrapper.ApplyCampResult> applyCamp(@Valid @RequestBody TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp){
         return succeed(tempDirectorTrainingCampDetailService.applyCamp(applyCamp));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/TempDirectorTrainingCampDetailWrapper.java

@@ -2,9 +2,6 @@ package com.ym.mec.biz.dal.wrapper;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.biz.dal.dto.PayParamBasicDto;
 import io.swagger.annotations.ApiModel;
@@ -61,6 +58,16 @@ public class TempDirectorTrainingCampDetailWrapper {
     }
 
     @Data
+    @ApiModel("ApplyCampResult")
+    public static class ApplyCampResult {
+        @ApiModelProperty(value = "支付状态")
+        private String paymentStatus;
+
+        @ApiModelProperty(value = "训练营详情编号")
+        private Integer campDetailId;
+    }
+
+    @Data
     @ApiModel(" applyCamp-新增/修改")
     public static class ApplyCamp {
 

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

@@ -13,7 +13,7 @@ public interface TempDirectorTrainingCampDetailService extends IService<TempDire
 
     TempDirectorTrainingCampDetailDao getDao();
 
-    Integer applyCamp(TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp);
+    TempDirectorTrainingCampDetailWrapper.ApplyCampResult applyCamp(TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp);
 
     TempDirectorTrainingCampDetailWrapper.UserPayDetail detail(Integer campId);
 

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

@@ -86,7 +86,7 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer applyCamp(TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp) {
+    public TempDirectorTrainingCampDetailWrapper.ApplyCampResult applyCamp(TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp) {
         Date now = new Date();
         TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(applyCamp.getTempDirectorTrainingCampId());
         this.checkTraining(now,trainingCamp);
@@ -161,12 +161,16 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
                 teacherDao.insert(teacher);
             }
             sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
+            teacherDao.updateUser(sysUser);
         }
         entity.setUserId(sysUser.getId());
         this.saveOrUpdate(entity);
+        TempDirectorTrainingCampDetailWrapper.ApplyCampResult applyCampResult = new TempDirectorTrainingCampDetailWrapper.ApplyCampResult();
+        applyCampResult.setCampDetailId(entity.getId());
+        applyCampResult.setPaymentStatus(entity.getPaymentStatus());
         // 删除缓存锁
         redissonClient.getBucket(submitLockKey).delete();
-        return entity.getId();
+        return applyCampResult;
     }
 
     @Override