suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-03-27 15:52:33 +08:00
parent 9ae3d8b44b 2be27eae16
commit 48e910af63
12 changed files with 622 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java Normal file
View File

@@ -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<Boolean> distribution(@RequestBody TrainingExperienceDistributionRequest request) {
return ResponseResult.success(trainingExperienceService.distribution(request));
}
}

17
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniJoinIntentionController.java
View File

@@ -4,13 +4,11 @@ package com.cool.store.controller.webc;
import com.cool.store.request.JoinIntentionRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.JoinIntentionService;
import com.cool.store.vo.PartnerBaseInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
@@ -24,9 +22,16 @@ public class MiniJoinIntentionController {
@Resource
private JoinIntentionService joinIntentionService;
@PostMapping(path = "/submit")
@ApiOperation("填写加盟意向申请书")
@PostMapping(path = "/submitOrUpdate")
@ApiOperation("填写或更新加盟意向申请书")
public ResponseResult<Boolean> submit(@RequestBody @Valid JoinIntentionRequest request) {
return ResponseResult.success(joinIntentionService.submit(request));
}
@GetMapping(path = "/getByLineId")
@ApiOperation("查找加盟意向申请书")
public ResponseResult<PartnerBaseInfoVO> getByLineId(@RequestParam("lineId") Long lineId) {
return ResponseResult.success(joinIntentionService.getByLineId(lineId));
}
}

16
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TrainingExperienceController.java → coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java
View File

@@ -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<Boolean> 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,