diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 0fb3e8e12..8d047619b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -48,10 +48,10 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt //更改线索流程子状态为【待审核】 LineInfoDO lineInfoParam = request.toLineInfoDO(); lineInfoParam.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_5.getCode()); - lineInfoMapper.insertOrUpdate(lineInfoParam); if (Objects.isNull(lineInfoParam)){ throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); } + lineInfoMapper.insertOrUpdate(lineInfoParam); return Boolean.TRUE; } return Boolean.FALSE; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java new file mode 100644 index 000000000..dacaaf3cd --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java @@ -0,0 +1,31 @@ +package com.cool.store.controller.webb; + +import com.cool.store.enums.ExperienceStatusEnum; +import com.cool.store.request.TrainingExperienceDistributionRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.TrainingExperienceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.websocket.server.PathParam; + +@RestController +@RequestMapping("/pc/training/experience/") +@Api(tags = "PC端-实训体验") +@Slf4j +public class PCTrainingExperienceController { + + @Resource + TrainingExperienceService trainingExperienceService; + + @ApiOperation("实训体验分配") + @PostMapping("/distribution") + public ResponseResult distribution(@RequestBody TrainingExperienceDistributionRequest request) { + return ResponseResult.success(trainingExperienceService.distribution(request)); + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TrainingExperienceController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java similarity index 72% rename from coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TrainingExperienceController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java index cf8b67368..f31af7a41 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TrainingExperienceController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller.webb; +package com.cool.store.controller.webc; import com.cool.store.enums.ExperienceStatusEnum; import com.cool.store.request.TrainingExperienceDistributionRequest; @@ -11,24 +11,16 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.websocket.server.PathParam; @RestController -@RequestMapping("/pc/training/experience/") -@Api(tags = "PC端-实训体验") +@RequestMapping("/mini/training/experience/") +@Api(tags = "移动端-实训体验") @Slf4j -public class TrainingExperienceController { +public class MiniTrainingExperienceController { @Resource TrainingExperienceService trainingExperienceService; - - @ApiOperation("实训体验分配") - @PostMapping("/distribution") - public ResponseResult distribution(@RequestBody TrainingExperienceDistributionRequest request) { - return ResponseResult.success(trainingExperienceService.distribution(request)); - } - @ApiOperation("实训体验状态变更") @GetMapping("/experience/{status}") public ResponseResult experienceStatusChange(@ApiParam(value = "实训体验状态 DONE:完成 ABANDON:放弃") @PathVariable(value = "status") ExperienceStatusEnum statusEnum,