From 1b88d4e15a0bbc3e5e764f526e75e5124fedbad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 23 Jul 2025 09:48:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat=EF=BC=9A=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/StoreDao.java | 6 ++++++ .../java/com/cool/store/mapper/StoreMapper.java | 2 ++ .../src/main/resources/mapper/StoreMapper.xml | 11 ++++++++++- .../com/cool/store/request/StoreCodeDTO.java | 17 +++++++++++++++++ .../com/cool/store/service/StoreService.java | 4 +++- .../store/service/impl/StoreServiceImpl.java | 13 +++++-------- .../controller/webb/OpenApiController.java | 6 ++++-- 7 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/StoreCodeDTO.java 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..abec45f5e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreCodeDTO.java @@ -0,0 +1,17 @@ +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-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 597712b9a..782dec799 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 @@ -4,6 +4,7 @@ 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.xgj.FranchiseFeeCallBackRequest; import com.cool.store.request.xgj.ReceiptCallBackRequest; import com.cool.store.response.ResponseResult; @@ -20,6 +21,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * @Author suzhuhong @@ -74,8 +76,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())); } } From 1e0d0e4f29e1b31fedece014421c62016240a175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 23 Jul 2025 10:55:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat=EF=BC=9A=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/request/StoreCodeDTO.java | 2 -- .../main/java/com/cool/store/config/OpenApiValidateFilter.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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 index abec45f5e..8d08ef4cd 100644 --- 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 @@ -11,7 +11,5 @@ import java.util.List; */ @Data public class StoreCodeDTO { - private List storeCodeList; - } 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 7d04371e0..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/statusRefresh/")){ + if(uri.startsWith("/zxjp/open/v1/statusRefresh")||uri.startsWith("/zxjp/open/v1/getStoreUser")){ filterChain.doFilter(servletRequest, response); return; } From c87aa6ba559630643b1ef910f86309eb2eb3c5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 23 Jul 2025 11:40:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=EF=BC=9A=E8=BF=87=E6=BB=A4=E6=8E=89?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E4=B8=8D=E5=8F=82=E4=B8=8E=E9=AA=8C=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/utils/OpenSignatureUtil.java | 1 + 1 file changed, 1 insertion(+) 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..5069f1026 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 From 2110c402987fc1e83238b43c11c1ed8080735151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 23 Jul 2025 12:11:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat=EF=BC=9A=E5=BE=85=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/utils/OpenSignatureUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5069f1026..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 @@ -46,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); }