diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java index 149a667fc..98ccd401e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java @@ -28,6 +28,7 @@ public class OpenSignatureUtil { .filter(e -> !"appKey".equals(e.getKey())) .filter(e -> !"timestamp".equals(e.getKey())) .filter(e -> !"sign".equals(e.getKey())) + .filter(e -> e.getValue() != null && !e.getValue().isEmpty()) .collect(Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue @@ -45,7 +46,7 @@ public class OpenSignatureUtil { // 3.2 添加固定参数（不参与排序） sb.append("appkey=").append(appKey) .append("×tamp=").append(timestamp); - + log.info("待签名字符串：{}", sb); // 4. 生成签名 return hmacSha256(sb.toString(), appSecret); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java index 715a46647..086cd178b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java @@ -76,5 +76,11 @@ public class StoreDao { return storeMapper.list(); } + public List getStoreNumByStoreCodes(List storeCodeIds) { + if(CollectionUtils.isEmpty(storeCodeIds)) { + return Lists.newArrayList(); + } + return storeMapper.getStoreNumByStoreCodes(storeCodeIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java index 3e20caf28..35b8fe785 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java @@ -43,4 +43,6 @@ public interface StoreMapper { List getStoreAreaList( @Param("storeIds") List storeIds); + List getStoreNumByStoreCodes(@Param("storeCodeIds") List storeCodeIds); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml index 173fc0c1e..3cc819371 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml @@ -144,6 +144,15 @@ - + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreCodeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreCodeDTO.java new file mode 100644 index 000000000..8d08ef4cd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreCodeDTO.java @@ -0,0 +1,15 @@ +package com.cool.store.request; + +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2025/7/23 9:24 + * @Version 1.0 + */ +@Data +public class StoreCodeDTO { + private List storeCodeList; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java index b73f5c998..01f5b00c4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java @@ -5,6 +5,8 @@ import com.cool.store.dto.store.StoreUserPositionDTO; import com.cool.store.response.MiniShopsResponse; import com.github.pagehelper.PageInfo; +import java.util.List; + /** * @Author suzhuhong * @Date 2025/5/13 9:56 @@ -23,6 +25,6 @@ public interface StoreService { PageInfo getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum); - PageInfo getStoreUser(Integer pageSize, Integer pageNum); + List getStoreUser(List storeCodeList); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index 7c1ada2ee..3d0e4a904 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -110,15 +110,13 @@ public class StoreServiceImpl implements StoreService { } @Override - public PageInfo getStoreUser(Integer pageSize, Integer pageNum) { - if (pageSize>=100){ + public List getStoreUser(List storeCodeList) { + if (CollectionUtils.isNotEmpty(storeCodeList)&&storeCodeList.size()>=100){ throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,"单次最多获取100条门店数据"); } - PageHelper.startPage(pageNum,pageSize); - List list = storeDao.list(); - PageInfo info = new PageInfo<>(list); + List list = storeDao.getStoreNumByStoreCodes(storeCodeList); if (CollectionUtils.isEmpty(list)){ - return info; + return new ArrayList<>(); } List result = new ArrayList<>(); list.forEach(x->{ @@ -143,8 +141,7 @@ public class StoreServiceImpl implements StoreService { storeUserPositionDTO.setUserList(userList); result.add(storeUserPositionDTO); }); - info.setList(result); - return info; + return result; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java index fc9816404..49abae684 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java @@ -98,7 +98,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer { BigRegionDO byRegionId = bigRegionDAO.getByRegionId(shopInfo.getRegionId()); if (byRegionId != null) { requestBody.setStore_area(byRegionId.getStoreManageRegionId() == null - ? shopInfo.getRegionId().toString() : shopInfo.getManagerRegionId().toString()); + ? shopInfo.getRegionId().toString() : byRegionId.getStoreManageRegionId().toString()); } else { requestBody.setStore_area(shopInfo.getRegionId().toString()); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java index 66ff5c7e8..8317f964f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java @@ -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; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java index ac49fef41..0f952709d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java @@ -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> getStoreUser(@RequestBody @Validated OpenApiStoreRequest dto) { - return ApiResponse.success(storeService.getStoreUser(dto.getPageSize(),dto.getPageNum())); + public ApiResponse> getStoreUser(@RequestBody @Validated StoreCodeDTO dto) { + return ApiResponse.success(storeService.getStoreUser(dto.getStoreCodeList())); } @ApiOperation("分配测量员，设计组") @PostMapping("/assignSurveyors")