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

Merge #36 into master from cc_20260130_store

Browse Source 
feat:：门店信息提供

* cc_20260130_store: (1 commits squashed)

  - feat:：门店信息提供

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/36
This commit is contained in:
正新
2026-02-02 06:36:14 +00:00
parent 77fea915e9
commit b3b98d980a
5 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
View File

@@ -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("门店状态")

17
coolstore-partner-model/src/main/java/com/cool/store/request/openapi/StoreRequest.java Normal file
View File

@@ -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;
}

17
coolstore-partner-model/src/main/java/com/cool/store/request/openapi/SubRegionRequest.java Normal file
View File

@@ -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;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
View File

@@ -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){

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

@@ -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<Boolean> statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){
@@ -259,4 +267,17 @@ public class OpenApiController {
public ResponseResult<ShopResponse> getShopNameAndCode(@RequestBody @Validated ShopListRequest request) {
return ResponseResult.success(shopService.getShopNameAndCodeByMobile(request.getMobile(), request.getShopId()));
}
@PostMapping("/queryAllBigRegion")
@ApiOperation("获取所有可选择的大区")
public ApiResponse<List<BigRegionDTO>> queryContentInfo(@RequestBody @Validated StoreRequest request) {
return ApiResponse.success(bigRegionService.queryAllBigRegion(request.getKeyword(), null,1));
}
@ApiOperation("获取管理下级区域")
@GetMapping("/getSubRegionByParentId")
public ApiResponse<List<RegionResponse>> getSubRegionByParentId(@RequestBody SubRegionRequest request) {
return ApiResponse.success(regionService.getSubRegionByParentId(request.getParentId()));
}
}