Merge #17 into master from cc_20251218_opening
Merge branch 'master' into cc_20251218_opening * cc_20251218_opening: (11 commits squashed) - fix:信发查询bug - fix:信发查询bug - fix:测试 - fix:老店新开不需要开业验收 - feat:开业验收数据处理 - fix:开业验收bug修复 - fix:开业验收bug修复 - fix:云流水权限开通 - feat:开业验收数据处理 - feat:开业验收数据处理 - Merge branch 'master' into cc_20251218_opening Signed-off-by: 苏竹红 <570057076@qq.com> Merged-by: 苏竹红 <570057076@qq.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17
This commit is contained in:
@@ -207,6 +207,13 @@ public class DeskController {
|
||||
return ResponseResult.success(deskService.buildInformationPendingList( deskRequest, userInfo ));
|
||||
}
|
||||
|
||||
@ApiOperation("待处理-开业验收")
|
||||
@PostMapping("/openingAcceptance")
|
||||
public ResponseResult<PageInfo<PreparationCommonPendingVO>> openingAcceptance(@RequestBody DeskRequest deskRequest) {
|
||||
LoginUserInfo userInfo = CurrentUserHolder.getUser();
|
||||
return ResponseResult.success(deskService.openingAcceptance( deskRequest, userInfo ));
|
||||
}
|
||||
|
||||
@ApiOperation("待处理-测量阶段")
|
||||
@PostMapping("/measurePendingList")
|
||||
public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestBody DeskRequest deskRequest) {
|
||||
@@ -239,4 +246,7 @@ public class DeskController {
|
||||
LoginUserInfo userInfo = CurrentUserHolder.getUser();
|
||||
return ResponseResult.success(deskService.submitBusinessRemark(request,userInfo));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.cool.store.controller.webb;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.cool.store.context.CurrentUserHolder;
|
||||
import com.cool.store.context.LoginUserInfo;
|
||||
import com.cool.store.request.AuditApproveRequest;
|
||||
import com.cool.store.request.opening.OpeningAcceptanceRequest;
|
||||
import com.cool.store.request.xgj.ReceiptCallBackRequest;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.response.bigdata.ApiResponse;
|
||||
import com.cool.store.service.opening.OpeningAcceptanceService;
|
||||
import com.cool.store.vo.OpenAreaTreeVO;
|
||||
import com.cool.store.vo.opening.OpeningAcceptanceDetailVO;
|
||||
import groovy.util.logging.Slf4j;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.w3c.dom.UserDataHandler;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Auther zx_szh
|
||||
* @Date 2025/12/22 14:14
|
||||
* @Version 1.0
|
||||
*/
|
||||
@lombok.extern.slf4j.Slf4j
|
||||
@RestController
|
||||
@RequestMapping("pc/OpeningAcceptance")
|
||||
@Api(tags = "PC-开业验收后")
|
||||
@Slf4j
|
||||
public class OpeningAcceptanceController {
|
||||
|
||||
@Resource
|
||||
private OpeningAcceptanceService openingAcceptanceService;
|
||||
|
||||
@ApiOperation("开业验收提交/重新提交")
|
||||
@PostMapping("/submitOpeningAcceptance")
|
||||
public ResponseResult<Boolean> submitOpeningAcceptance(@RequestBody @Validated OpeningAcceptanceRequest request){
|
||||
log.info("submitOpeningAcceptance request：{}", JSONObject.toJSONString(request));
|
||||
LoginUserInfo user = CurrentUserHolder.getUser();
|
||||
return ResponseResult.success(openingAcceptanceService.addOpeningAcceptance(request,user));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/getAcceptanceDetail")
|
||||
@ApiOperation("获取门店开业验收数据")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "shopId", value = "门店ID", required = true)
|
||||
})
|
||||
public ResponseResult<OpeningAcceptanceDetailVO> getAcceptanceDetail(@RequestParam(value = "shopId",required = true)Long shopId){
|
||||
return ResponseResult.success(openingAcceptanceService.getAcceptanceDetail(shopId));
|
||||
}
|
||||
|
||||
@ApiOperation("开业验收审核")
|
||||
@PostMapping("/auditOpeningAcceptance")
|
||||
public ResponseResult<Boolean> auditOpeningAcceptance(@RequestBody @Validated AuditApproveRequest request){
|
||||
log.info("auditOpeningAcceptance request：{}", JSONObject.toJSONString(request));
|
||||
LoginUserInfo user = CurrentUserHolder.getUser();
|
||||
return ResponseResult.success(openingAcceptanceService.auditOpeningAcceptance(request,user));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -34,6 +34,12 @@ public class PCOrderSysController {
|
||||
return ResponseResult.success(posAndOrderInfoService.submitOrUpdate(request, CurrentUserHolder.getUserId()));
|
||||
}
|
||||
|
||||
@ApiOperation("开通云流水权限")
|
||||
@GetMapping("/openYlsAuth")
|
||||
public ResponseResult<Boolean> openYlsAuth(@RequestParam("shopId") Long shopId){
|
||||
return ResponseResult.success(posAndOrderInfoService.openYlsAuth(shopId));
|
||||
}
|
||||
|
||||
@ApiOperation("获取")
|
||||
@GetMapping("/get")
|
||||
public ResponseResult<PosAndOrderResponse> get(@RequestParam("shopId") Long shopId){
|
||||
|
||||
@@ -53,6 +53,7 @@ import com.cool.store.utils.poi.StringUtils;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.sun.org.apache.xpath.internal.operations.Bool;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -97,6 +98,8 @@ public class PCTestController {
|
||||
private XxlJobHandler xxlJobHandler;
|
||||
@Resource
|
||||
DataHandleService dataHandleService;
|
||||
@Resource
|
||||
DataHandlerServer dataHandlerServer;
|
||||
static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid=";
|
||||
|
||||
@Resource
|
||||
@@ -893,5 +896,14 @@ public class PCTestController {
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("开业验收数据处理")
|
||||
@GetMapping("/openingAcceptanceDataHandle")
|
||||
public ResponseResult<Boolean> openingAcceptanceDataHandle() {
|
||||
dataHandlerServer.openingAcceptanceDataHandle();
|
||||
return ResponseResult.success(Boolean.TRUE);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.cool.store.controller.webc;
|
||||
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.opening.OpeningAcceptanceService;
|
||||
import com.cool.store.vo.opening.OpeningAcceptanceDetailVO;
|
||||
import groovy.util.logging.Slf4j;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @Auther zx_szh
|
||||
* @Date 2025/12/22 14:22
|
||||
* @Version 1.0
|
||||
*/
|
||||
@lombok.extern.slf4j.Slf4j
|
||||
@RestController
|
||||
@RequestMapping("mini/OpeningAcceptance")
|
||||
@Api(tags = "小程序-开业验收后")
|
||||
@Slf4j
|
||||
public class MiniOpeningAcceptanceController {
|
||||
|
||||
@Resource
|
||||
private OpeningAcceptanceService openingAcceptanceService;
|
||||
|
||||
@GetMapping(path = "/getAcceptanceDetail")
|
||||
@ApiOperation("获取门店开业验收数据")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "shopId", value = "门店ID", required = true)
|
||||
})
|
||||
public ResponseResult<OpeningAcceptanceDetailVO> getAcceptanceDetail(@RequestParam(value = "shopId",required = true)Long shopId){
|
||||
return ResponseResult.success(openingAcceptanceService.getAcceptanceDetail(shopId));
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user