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-04-15 09:50:41 +08:00
parent 74e37a73c6 609d2309c5
commit f33ae0c30e
22 changed files with 493 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,54 @@
package com.cool.store.controller.webb;
import com.cool.store.request.AuditCheckRequest;
import com.cool.store.request.AuditDetailRequest;
import com.cool.store.response.AuditDetailResponse;
import com.cool.store.response.CheckListResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.AuditStatusService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
@Api(tags = "稽核相关")
@RestController
@RequestMapping("pc/audit/stage")
public class AuditStatusController {
@Resource
AuditStatusService auditStatusService;
@ApiOperation("稽核")
@PostMapping("/check")
public ResponseResult<Boolean> check(@RequestBody AuditCheckRequest request) {
return ResponseResult.success(auditStatusService.audit(request));
}
@ApiOperation("查看/稽核按钮")
@PostMapping("/detail")
public ResponseResult<AuditDetailResponse> detail(@RequestBody AuditDetailRequest request) {
return ResponseResult.success(auditStatusService.detail(request));
}
@ApiOperation("稽核列表")
@GetMapping("/checkList")
public ResponseResult<PageInfo<CheckListResponse>> checkList(@RequestParam(value = "partnerNameOrPhone",required = false) String partnerNameOrPhone,
@RequestParam(value = "startTime",required = false) String startTime,
@RequestParam(value = "endTime",required = false) String endTime,
@RequestParam(value = "region",required = false) String region,
@RequestParam(value = "checkStatus",required = false) Integer checkStatus,
@RequestParam(value = "checkStage",defaultValue = "1") Integer checkStage,
@RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(auditStatusService.checkList(partnerNameOrPhone,startTime,endTime,region,checkStatus,checkStage,pageNum,pageSize));
}
}

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

@@ -42,13 +42,13 @@ public class LineAuditController {
@ApiOperation("审核通过")
@PostMapping("/pass")
public ResponseResult<Boolean> auditPass(@RequestBody AuditPassRequest request){
return ResponseResult.success(commonService.getLineFlowService(request.getWorkflowSubStage()).auditPass(request));
return ResponseResult.success(commonService.getLineFlowService(request.getWorkflowSubStage()).auditPass(request,CurrentUserHolder.getUserId()));
}
@ApiOperation("审核拒绝")
@PostMapping("/reject")
public ResponseResult<Boolean> auditReject(@RequestBody AuditRejectRequest request){
return ResponseResult.success(commonService.getLineFlowService(request.getWorkflowSubStage()).auditReject(request));
return ResponseResult.success(commonService.getLineFlowService(request.getWorkflowSubStage()).auditReject(request,CurrentUserHolder.getUserId()));
}
@ApiOperation("重新缴费")