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

fix

Browse Source
This commit is contained in:
shuo.wang
2025-01-13 14:53:18 +08:00
parent 5d2afdf9c5
commit 06e37e0e89
9 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
View File

@@ -117,12 +117,7 @@ public class PCShopController {
return ResponseResult.success(transferLogService.getTransferLogPage(pageNum, pageSize, lineId, lineShopType));
}
@ApiOperation("开店管理列表")
@PostMapping("/getBranchShopList")
public ResponseResult<PageInfo<BranchShopResponse>> getBranchShopList(@RequestBody @Validated BranchShopRequest request) {
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(shopService.getBranchShopList(request, userId));
}
@ApiOperation("门店结束跟进")

15
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PreparationController.java
View File

@@ -1,10 +1,14 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.BranchShopRequest;
import com.cool.store.request.PreparationRequest;
import com.cool.store.request.TrainingExperienceDistributionRequest;
import com.cool.store.response.BranchShopDetailResponse;
import com.cool.store.response.BranchShopResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreparationService;
import com.cool.store.service.ShopService;
import com.cool.store.service.impl.PreparationServiceImpl;
import com.cool.store.vo.Preparation.PreparationProcessVO;
import com.cool.store.vo.Preparation.PreparationScheduleDetailVO;
@@ -31,19 +35,20 @@ public class PreparationController {
@Resource
PreparationService preparationService;
@Resource
ShopService shopService;
@ApiOperation("进度列表")
@PostMapping("/list")
public ResponseResult<PageInfo<PreparationScheduleVO>> distribution(@RequestBody PreparationRequest request) {
request.setCurUserId(CurrentUserHolder.getUserId());
return ResponseResult.success(preparationService.getPreparationSchedule(request));
public ResponseResult<PageInfo<BranchShopResponse>> distribution(@RequestBody BranchShopRequest request) {
return ResponseResult.success(shopService.getBranchShopList(request,CurrentUserHolder.getUserId()));
}
@ApiOperation("筹建详情")
@GetMapping("/getPreparationDetail")
public ResponseResult<PreparationScheduleDetailVO> getPreparationDetail(@RequestParam("shopId")Long shopId) {
return ResponseResult.success(preparationService.getPreparationDetail(shopId));
public ResponseResult<BranchShopDetailResponse> getPreparationDetail(@RequestParam("shopId")Long shopId) {
return ResponseResult.success(shopService.getBranchShopDetail(shopId));
}
@ApiOperation("筹建进展")