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

Merge branch 'master' into cc_20250723_Decoration

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
This commit is contained in:
shuo.wang
2025-07-24 15:29:31 +08:00
parent 34f46d97ee 4ba6266f5c
commit 9fa0d19cd4
10 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java
View File

@@ -58,7 +58,7 @@ public class OpenApiValidateFilter implements Filter {
}
MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
//statusRefresh 放开不需要验签
if(uri.startsWith("/zxjp/open/v1")){
if(uri.startsWith("/zxjp/open/v1/statusRefresh")||uri.startsWith("/zxjp/open/v1/getStoreUser")){
filterChain.doFilter(servletRequest, response);
return;
}

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

@@ -3,6 +3,8 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.*;
import com.cool.store.dto.store.StoreUserPositionDTO;
import com.cool.store.request.OpenApiStoreRequest;
import com.cool.store.request.StoreCodeDTO;
import com.cool.store.request.*;
import com.cool.store.request.xgj.FranchiseFeeCallBackRequest;
import com.cool.store.request.xgj.ReceiptCallBackRequest;
@@ -17,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author suzhuhong
@@ -75,8 +78,8 @@ public class OpenApiController {
}
@ApiOperation("获取门店人员信息")
@PostMapping("/getStoreUser")
public ApiResponse<PageInfo<StoreUserPositionDTO>> getStoreUser(@RequestBody @Validated OpenApiStoreRequest dto) {
return ApiResponse.success(storeService.getStoreUser(dto.getPageSize(),dto.getPageNum()));
public ApiResponse<List<StoreUserPositionDTO>> getStoreUser(@RequestBody @Validated StoreCodeDTO dto) {
return ApiResponse.success(storeService.getStoreUser(dto.getStoreCodeList()));
}
@ApiOperation("分配测量员，设计组")
@PostMapping("/assignSurveyors")