From b3b98d980af0b5cc6df46f16a43afbe8d86a983c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Mon, 2 Feb 2026 06:36:14 +0000 Subject: [PATCH] Merge #36 into master from cc_20260130_store MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:：门店信息提供 * cc_20260130_store: (1 commits squashed) - feat:：门店信息提供 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/36 --- .../java/com/cool/store/dto/StoreDTO.java | 8 +++++-- .../store/request/openapi/StoreRequest.java | 17 +++++++++++++++ .../request/openapi/SubRegionRequest.java | 17 +++++++++++++++ .../store/service/impl/StoreServiceImpl.java | 2 ++ .../controller/webb/OpenApiController.java | 21 +++++++++++++++++++ 5 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/openapi/StoreRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/openapi/SubRegionRequest.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java index 9bc065572..4145566d0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java @@ -52,9 +52,13 @@ public class StoreDTO { private String addresseeArea; @ApiModelProperty("订货地址") private String addresseeAddress; - @ApiModelProperty("管理督导-crm系统的regionId") + @ApiModelProperty("管理督导-crm系统的regionId(分组)") private String managerSupervisionName; - @ApiModelProperty("所属大区/分部") + @ApiModelProperty("管理督导ID") + private Long regionId; + @ApiModelProperty("管理督导-crm系统的regionId(分组)") + private Long branchId; + @ApiModelProperty("所属大区)") private String branchName; @ApiModelProperty("门店状态") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/StoreRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/StoreRequest.java new file mode 100644 index 000000000..079161b23 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/StoreRequest.java @@ -0,0 +1,17 @@ +package com.cool.store.request.openapi; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Auther zx_szh + * @Date 2026/1/30 15:00 + * @Version 1.0 + */ +@Data +public class StoreRequest { + + @ApiModelProperty("关键字搜索") + private String keyword; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/SubRegionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/SubRegionRequest.java new file mode 100644 index 000000000..5d649b650 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/openapi/SubRegionRequest.java @@ -0,0 +1,17 @@ +package com.cool.store.request.openapi; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Auther zx_szh + * @Date 2026/1/30 15:08 + * @Version 1.0 + */ +@Data +public class SubRegionRequest { + + @ApiModelProperty("所属大区ID") + private Long parentId; + +} 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 a7909ccf0..31a8b967a 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 @@ -447,9 +447,11 @@ public class StoreServiceImpl implements StoreService { dto.setOrderMiniProgramName(store.getMiniProgramOrderStoreName()); dto.setStatus(StoreStatusEnum.getName(store.getStoreStatus())); if (store.getRegionId() != null){ + dto.setRegionId(store.getRegionId()); dto.setManagerSupervisionName(regionMap.get(store.getRegionId())); } if (store.getBranch()!=null){ + dto.setBranchId(store.getBranch()); dto.setBranchName(regionMap.get(store.getBranch())); } if (store.getJoinSupervision()!=null){ 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 9a508e176..d9e9a6eb3 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 @@ -2,6 +2,7 @@ package com.cool.store.controller.webb; import com.alibaba.fastjson.JSONObject; import com.cool.store.dto.*; +import com.cool.store.dto.region.BigRegionDTO; import com.cool.store.dto.store.StoreUserPositionDTO; import com.cool.store.dto.wallet.PaymentDTO; import com.cool.store.dto.wx.MiniProgramFreeLoginDTO; @@ -14,11 +15,14 @@ import com.cool.store.request.close.store.ThirdCloseStoreApplyRequest; import com.cool.store.request.notice.ThirdHandleMessageRequest; import com.cool.store.request.notice.ThirdMatterRequest; import com.cool.store.request.openapi.ShopListRequest; +import com.cool.store.request.openapi.StoreRequest; +import com.cool.store.request.openapi.SubRegionRequest; import com.cool.store.request.wallet.AccountTradeCallbackRequest; import com.cool.store.request.wallet.AddTagCallbackNoticeRequest; import com.cool.store.request.wallet.OnlineCommercialBankCallbackRequest; import com.cool.store.request.xgj.FranchiseFeeCallBackRequest; import com.cool.store.request.xgj.ReceiptCallBackRequest; +import com.cool.store.response.RegionResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.ShopResponse; import com.cool.store.response.bigdata.ApiResponse; @@ -72,6 +76,10 @@ public class OpenApiController { CloseStoreService closeStoreService; @Resource ShopService shopService; + @Resource + BigRegionService bigRegionService; + @Resource + RegionService regionService; @PostMapping("/statusRefresh") public ApiResponse statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){ @@ -259,4 +267,17 @@ public class OpenApiController { public ResponseResult getShopNameAndCode(@RequestBody @Validated ShopListRequest request) { return ResponseResult.success(shopService.getShopNameAndCodeByMobile(request.getMobile(), request.getShopId())); } + + @PostMapping("/queryAllBigRegion") + @ApiOperation("获取所有可选择的大区") + public ApiResponse> queryContentInfo(@RequestBody @Validated StoreRequest request) { + return ApiResponse.success(bigRegionService.queryAllBigRegion(request.getKeyword(), null,1)); + } + + @ApiOperation("获取管理下级区域") + @GetMapping("/getSubRegionByParentId") + public ApiResponse> getSubRegionByParentId(@RequestBody SubRegionRequest request) { + return ApiResponse.success(regionService.getSubRegionByParentId(request.getParentId())); + } + }