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

fix desk

Browse Source
This commit is contained in:
shuo.wang
2024-10-12 20:03:10 +08:00
parent bdd4c53653
commit d7b9bb36d5
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
View File

@@ -150,6 +150,8 @@ public interface DeskService {
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> firstOrderListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user); PageInfo<PreparationCommonPendingVO> firstOrderListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
/** /**
* 信发系统 * 信发系统
*/ */

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -371,6 +371,12 @@ public class DeskServiceImpl implements DeskService {
return null; return null;
} }
@Override
public PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_5,
Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE);
}
@Override @Override
public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23, return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23,

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

@@ -141,6 +141,13 @@ public class DeskController {
return ResponseResult.success(deskService.firstOrderListPendingList(pageNumber,pageSize,userInfo)); return ResponseResult.success(deskService.firstOrderListPendingList(pageNumber,pageSize,userInfo));
} }
@ApiOperation("待处理-培训登记")
@GetMapping("/trainListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> trainListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.trainListPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-信发系统") @ApiOperation("待处理-信发系统")
@GetMapping("/xinFaListPendingList") @GetMapping("/xinFaListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,