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

Merge #28 into master from cc_20260114_fix

Browse Source 
feat:红圈通邮箱

* cc_20260114_fix: (8 commits squashed)

  - feat:加盟公司自有店-开放推送红圈通

  - feat:加盟公司自有店-开放推送红圈通 2、结束门店解绑铺位 3、红圈通新增招商所属大区 运营顾问字段

  - feat:红圈通新增推送邮箱

  - fix:大区取值

  - fix:测试

  - feat:推送人员名称

  - feat:结束跟进  目前是任何时候都可以，单独解绑铺位 需要在加盟签约合同之前

  - 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/28
This commit is contained in:
正新
2026-01-19 07:05:42 +00:00
parent 159f112113
commit 0ad517dce6
12 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,11 +611,13 @@ public class PCTestController {
return ApiResponse.success(decorationDesignInfoService.decorationAcceptance(request));
}
@Resource
SignFranchiseService signFranchiseService;
@ApiOperation("测试红圈通建店")
@GetMapping("/testHqtBuild")
public ApiResponse<Boolean> testHqtBuild(@RequestParam("shopId")Long shopId) {
HqtBuildRequest hqtBuildRequest = getHqtBuildRequest(shopId);
hqtAPIService.pushHqtBuild(hqtBuildRequest);
hqtAPIService.pushHqtBuild(signFranchiseService.getHqtBuildRequest(shopId));
return ApiResponse.success(true);
}
@@ -627,35 +629,6 @@ public class PCTestController {
}
public HqtBuildRequest getHqtBuildRequest(Long shopId) {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId());
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager());
BigRegionDO bigRegionDO = bigRegionDAO.getByRegionId(shopInfo.getRegionId());
HqtBuildRequest request = new HqtBuildRequest();
request.setShopId(shopId);
request.setShopCode(shopInfo.getShopCode());
request.setShopName(shopInfo.getShopName());
request.setShopDecorationAttributes(shopInfo.getShopDecorationAttributes());
request.setHqtRegionCode(bigRegionDO.getHqtRegionCode());
request.setHqtRegionName(bigRegionDO.getHqtRegionName());
request.setSupervisorName(userInfoById.getName());
request.setSupervisorMobile(userInfoById.getMobile());
request.setPartnershipSignatoryFirst(lineInfoDO.getUsername());
request.setPartnershipSignatoryFirstMobile(lineInfoDO.getMobile());
request.setShopAddress(shopInfo.getDetailAddress());
request.setIsPayDesignFee(CommonConstants.ONE);
if (StringUtils.isNotBlank(shopInfo.getFranchiseBrand())) {
request.setFranchiseBrand(Integer.valueOf(shopInfo.getFranchiseBrand()));
}
return request;
}
@RequestMapping(value = "/testWxNotice", produces = "application/xml;charset=UTF-8")
@ApiOperation("testWxNotice")
public String handleWechatMessage(

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

@@ -70,7 +70,7 @@ public class PointController {
@ApiOperation("铺位解绑")
@PostMapping("/unbind")
public ResponseResult<Integer> pointUnbind(@RequestBody PointIdRequest request) {
return ResponseResult.success(pointService.pointUnbind(request.getPointId()));
return ResponseResult.success(pointService.pointUnbind(request.getPointId(),Boolean.FALSE));
}
@ApiOperation("配置高德评估报告")