From fbae407c00292d09ce8df645339c404e062d02d3 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 23 Jul 2025 17:02:14 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/DecorationMeasureDAO.java | 7 ++ .../java/com/cool/store/dao/ShopInfoDAO.java | 5 + .../mapper/DecorationDesignInfoMapper.xml | 8 ++ .../mapper/DecorationMeasureMapper.xml | 3 + .../main/resources/mapper/ShopInfoMapper.xml | 3 +- .../com/cool/store/entity/BigRegionDO.java | 11 +++ .../store/entity/DecorationDesignInfoDO.java | 17 ++++ .../store/entity/DecorationMeasureDO.java | 6 ++ .../com/cool/store/entity/ShopInfoDO.java | 3 + .../store/request/AssignDesignerRequest.java | 22 +++++ .../store/request/AssignQuotationRequest.java | 22 +++++ .../store/request/AssignSurveyorsRequest.java | 31 ++++++ .../request/SubmitDesignDrawingRequest.java | 32 +++++++ .../request/SubmitMeasurementRequest.java | 28 ++++++ .../request/SubmitQuotationSheetRequest.java | 22 +++++ .../service/DecorationDesignInfoService.java | 32 +++++++ .../service/DecorationMeasureService.java | 16 ++++ .../com/cool/store/service/HqtAPIService.java | 14 +++ .../impl/DecorationDesignInfoServiceImpl.java | 96 +++++++++++++++++++ .../impl/DecorationMeasureServiceImpl.java | 69 ++++++++++++- .../store/service/impl/HqtAPIServiceImpl.java | 21 ++++ .../service/impl/OrderSysInfoServiceImpl.java | 81 +++++++++++----- .../controller/webb/OpenApiController.java | 46 ++++++++- 23 files changed, 560 insertions(+), 35 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/AssignDesignerRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/AssignQuotationRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/AssignSurveyorsRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/SubmitDesignDrawingRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/SubmitMeasurementRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/SubmitQuotationSheetRequest.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/HqtAPIService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java index c10472ac4..6a2ffcb66 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java @@ -48,12 +48,19 @@ public class DecorationMeasureDAO { decorationMeasureDO.setCreateTime(new Date()); return decorationMeasureMapper.insertSelective(decorationMeasureDO); } + public Integer insertSelective(DecorationMeasureDO decorationMeasureDO) { + return decorationMeasureMapper.insertSelective(decorationMeasureDO); + } public Integer updateByPrimaryKeySelective(DecorationMeasureDO decorationMeasureDO, String userId) { decorationMeasureDO.setUpdateUserId(userId); decorationMeasureDO.setUpdateTime(new Date()); return decorationMeasureMapper.updateByPrimaryKeySelective(decorationMeasureDO); } + public Integer updateByPrimaryKeySelective(DecorationMeasureDO decorationMeasureDO) { + decorationMeasureDO.setUpdateTime(new Date()); + return decorationMeasureMapper.updateByPrimaryKeySelective(decorationMeasureDO); + } public DecorationMeasureDO getByShopId(Long shopId) { if (shopId == null) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 8b6deee58..3390b1c41 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -334,4 +334,9 @@ public class ShopInfoDAO { } return shopInfoMapper.updateManagerRegionId(shopList); } + public ShopInfoDO getShopInfoByShopCode(String shopCode){ + Example example = new Example(ShopInfoDO.class); + example.createCriteria().andEqualTo("shopCode", shopCode); + return shopInfoMapper.selectOneByExample(example); + } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index a3dacac2a..58dcbecb5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -26,6 +26,14 @@ + + + + + + + + update xfsg_decoration_design_info diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml index 7779c1d9c..6bf737af5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml @@ -19,6 +19,9 @@ + + + - select - id,shop_id,measure_user_id,design_user_id,measure_date,diagram_date,measure_url,remark, - submit_time,create_time,update_time,deleted,create_user_id,update_user_id + select * from xfsg_decoration_measure where shop_id = #{shopId} and deleted = 0 + + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java index 38fa27a1c..836659137 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java @@ -43,6 +43,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean assignDesigner(AssignDesignerRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -76,6 +80,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitDesignDrawing(SubmitDesignDrawingRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -102,6 +110,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean assignQuotation(AssignQuotationRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -125,6 +137,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitQuotationSheet(SubmitQuotationSheetRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -152,6 +168,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitConstructionOrder(ConstructionOrderRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -174,6 +194,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean entryConfirmation(EntryConfirmationRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -195,6 +219,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean constructionCompleted(ConstructionCompletedRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -216,6 +244,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean decorationAcceptance(HqtDecorationAcceptanceRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 350aaf141..2e263763d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -179,6 +179,10 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { @Override public Boolean assignSurveyors(AssignSurveyorsRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -225,6 +229,10 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { @Override public Boolean submitMeasurementDiagram(SubmitMeasurementRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); From d7569b843503238ea8de9dcb6d16fd00791ec58c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 4 Aug 2025 16:21:21 +0800 Subject: [PATCH 21/38] =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/ShopInfoDAO.java | 6 +++++ .../com/cool/store/service/ShopService.java | 6 +++++ .../service/impl/OrderSysInfoServiceImpl.java | 6 +++++ .../store/service/impl/ShopServiceImpl.java | 24 +++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 88c7b93b8..b41d60fd6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -342,4 +342,10 @@ public class ShopInfoDAO { public Integer getNumByShopCode(String shopCode){ return shopInfoMapper.getNumByShopCode(shopCode); } + + public List getShopListByShopCode(String shopCode){ + Example example = new Example(ShopInfoDO.class); + example.createCriteria().andEqualTo("shopCode", shopCode); + return shopInfoMapper.selectByExample(example); + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index bc13046c1..4a0a15c44 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -134,4 +134,10 @@ public interface ShopService { List getSubStageHandle(Long shopId,Integer subStage); ShopStageInfoVO getShopStageStatus(Long shopId, Integer subStage); + /** + * @Auther: wangshuo + * @Date: 2025/8/4 + * @description: 校验门店编码重复 + */ + Boolean checkShopCodeRepeat(String shopCode,Long shopId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 0fcac4fcd..73d8e362d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -37,6 +37,8 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; @Service public class OrderSysInfoServiceImpl implements OrderSysInfoService { + @Resource + private ShopService shopService; @Resource private HqtAPIService hqtAPIService; @Resource @@ -132,6 +134,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } } if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())) { + //检验门店编码是否重复 + if(shopService.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } shopInfoDAO.updateShopCode(request.getShopCode(), request.getShopId()); orderSysInfoDO.setReceivingFirmName(request.getReceivingFirmName()); orderSysInfoDO.setReceivingMsBankAccount(request.getReceivingMsBankAccount()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index fd8a16a13..77ba672a5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -308,6 +308,10 @@ public class ShopServiceImpl implements ShopService { @Override public Integer updateShopCode(UpdateShopCodeRequest request, String userId) { + //检验门店编码是否重复 + if(this.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); if (Objects.isNull(shopInfo)) { throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); @@ -429,6 +433,10 @@ public class ShopServiceImpl implements ShopService { @Override public Integer updateBranchShopDetail(BranchShopDetailRequest request, String userId) { + //检验门店编码是否重复 + if(this.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); shopInfo.setUpdateUserId(userId); shopInfo.setUpdateTime(new Date()); @@ -893,6 +901,22 @@ public class ShopServiceImpl implements ShopService { return null; } + @Override + public Boolean checkShopCodeRepeat(String shopCode, Long shopId) { + //false 未重复, true 重复 + List shopListByShopCode = shopInfoDAO.getShopListByShopCode(shopCode); + if (CollectionUtils.isEmpty(shopListByShopCode)){ + return false; + } + if (CollectionUtils.isNotEmpty(shopListByShopCode)&&shopId ==null){ + return true; + } + if (shopListByShopCode.size() == 1 && shopListByShopCode.get(0).getId().equals(shopId)){ + return false; + } + return true; + } + /** * 获取招商经理信息 * @param From b6a0754970f1f6e34bcaf1a310dda7181303f658 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 5 Aug 2025 15:53:46 +0800 Subject: [PATCH 22/38] fix --- .../java/com/cool/store/service/impl/HqtAPIServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index bf5cebf0b..66debbece 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -181,9 +181,9 @@ public class HqtAPIServiceImpl implements HqtAPIService { throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, "HTTP请求失败，状态码: " + response.code()); } - - log.info("请求成功responseBody:{}",JSONObject.toJSONString(response.body().string())); - HqtAPIResponse hqtAPIResponse = objectMapper.readValue(response.body().string(), HqtAPIResponse.class); + String responseBody = response.body().string(); + log.info("请求成功responseBody:{}",JSONObject.toJSONString(responseBody)); + HqtAPIResponse hqtAPIResponse = objectMapper.readValue(responseBody, HqtAPIResponse.class); return hqtAPIResponse; } catch (ServiceException e) { throw e; From b7c175c1a46021bdbf7f436fc10be83697d59e12 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 5 Aug 2025 16:03:53 +0800 Subject: [PATCH 23/38] fix --- .../src/main/java/com/cool/store/dto/HqtTokenDTO.java | 1 + .../src/main/java/com/cool/store/response/HqtAPIResponse.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java index 4ec0d9958..1a9e578cd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java @@ -9,6 +9,7 @@ import lombok.Data; * @注释: */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class HqtTokenDTO { //访问令牌 private String access_token; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java index 98ef038ad..27dcc3fdb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java @@ -1,5 +1,6 @@ package com.cool.store.response; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; /** @@ -9,6 +10,7 @@ import lombok.Data; * @注释: */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class HqtAPIResponse { /** From eb9d4698337a9831a4759f37c5d900c56ecac0e2 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 09:25:23 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E7=BA=A2=E5=9C=88=E9=80=9A=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E9=80=A0hqtShopId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/ShopInfoDAO.java | 7 +++++++ .../com/cool/store/mapper/ShopInfoMapper.java | 3 +++ .../main/resources/mapper/ShopInfoMapper.xml | 6 +++++- .../java/com/cool/store/dto/HqtTokenDTO.java | 1 - .../java/com/cool/store/entity/ShopInfoDO.java | 3 +++ .../store/request/ConfirmQuotationRequest.java | 4 ++-- .../com/cool/store/request/HqtBuildRequest.java | 1 + .../request/HqtPartnerAcceptanceRequest.java | 4 ++-- .../com/cool/store/response/HqtAPIResponse.java | 2 -- .../service/impl/DecorationServiceImpl.java | 4 ++-- .../store/service/impl/HqtAPIServiceImpl.java | 17 +++++++++-------- .../service/impl/OrderSysInfoServiceImpl.java | 1 + 12 files changed, 35 insertions(+), 18 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index b41d60fd6..baaf1f884 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -348,4 +348,11 @@ public class ShopInfoDAO { example.createCriteria().andEqualTo("shopCode", shopCode); return shopInfoMapper.selectByExample(example); } + + public Integer updateHqtShopId (Long shopId,String hqtShopId){ + if (shopId==null || StringUtils.isBlank(hqtShopId)){ + return 0; + } + return shopInfoMapper.updateHqtShopId(shopId, hqtShopId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index bbb859a1c..addfddfde 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -14,6 +14,7 @@ import com.cool.store.response.MiniShopsResponse; import com.cool.store.response.PlatformBuildListResponse; import com.cool.store.vo.shop.StageShopCountVO; import com.github.pagehelper.Page; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -147,4 +148,6 @@ public interface ShopInfoMapper extends Mapper { List selectIsCreateStore(); Integer updateManagerRegionId(@Param("list") List shopList); Integer getNumByShopCode(@Param("shopCode") String shopCode); + + Integer updateHqtShopId(@Param("shopId") Long shopId,@Param("hqtShopId") String hqtShopId); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 2169654b3..4dc2769da 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -37,6 +37,7 @@ + @@ -45,7 +46,7 @@ shop_code, store_num, shop_manager_user_id, supervisor_user_id, plan_open_time, cur_progress, shop_type, shop_stage, deleted, create_time, update_time, join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id,store_type - , province,province_code,city,city_code,district,district_code,manager_region_id,shop_decoration_attributes + , province,province_code,city,city_code,district,district_code,manager_region_id,shop_decoration_attributes,hqt_shop_id @@ -590,4 +591,7 @@ update xfsg_shop_info set manager_region_id = #{item.managerRegionId} where id = #{item.id} + + update xfsg_shop_info set hqt_shop_id = #{hqtShopId} where id = #{shopId} + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java index 1a9e578cd..4ec0d9958 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/HqtTokenDTO.java @@ -9,7 +9,6 @@ import lombok.Data; * @注释: */ @Data -@JsonIgnoreProperties(ignoreUnknown = true) public class HqtTokenDTO { //访问令牌 private String access_token; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java index 2fcf81ce3..54b6a0f0f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java @@ -155,4 +155,7 @@ public class ShopInfoDO { // 门店装修属性 @Column(name = "shop_decoration_attributes") private Integer shopDecorationAttributes; + //红圈通门店id + @Column(name = "hqt_shop_id") + private String hqtShopId; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ConfirmQuotationRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ConfirmQuotationRequest.java index 258c374c4..c98805d12 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ConfirmQuotationRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ConfirmQuotationRequest.java @@ -14,13 +14,13 @@ import java.util.Objects; */ @Data public class ConfirmQuotationRequest { - private String shopCode; + private String hqtShopId; private String quotationSheetId; @ApiModelProperty("0:拒绝，1:通过") private Integer status; public Boolean check(){ - if (StringUtils.isAnyBlank(shopCode,quotationSheetId)){ + if (StringUtils.isAnyBlank(hqtShopId,quotationSheetId)){ return false; } if (Objects.isNull(status)){ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java index efa9a245b..e55f75d32 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java @@ -13,6 +13,7 @@ import java.util.Objects; */ @Data public class HqtBuildRequest { + private Long shopId; //门店编码 private String shopCode; //门店名称 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtPartnerAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtPartnerAcceptanceRequest.java index af7f4224d..c2342d25a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtPartnerAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtPartnerAcceptanceRequest.java @@ -14,14 +14,14 @@ import java.util.Objects; @Data public class HqtPartnerAcceptanceRequest { - private String shopCode; + private String hqtShopId; //加盟商满意度 3-差，4-一般，5-好，6-非常好 对应红圈通 回访结果分类 private Integer satisfaction; //加盟商评语 private String comment; public Boolean check() { - if (StringUtils.isAnyBlank(shopCode)){ + if (StringUtils.isAnyBlank(hqtShopId)){ return false; } if (Objects.isNull(satisfaction)){ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java index 27dcc3fdb..98ef038ad 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/HqtAPIResponse.java @@ -1,6 +1,5 @@ package com.cool.store.response; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; /** @@ -10,7 +9,6 @@ import lombok.Data; * @注释: */ @Data -@JsonIgnoreProperties(ignoreUnknown = true) public class HqtAPIResponse { /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 21d2d3366..4fb07c6b0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -376,7 +376,7 @@ public class DecorationServiceImpl implements DecorationService { ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); HqtPartnerAcceptanceRequest hqtPartnerAcceptanceRequest = new HqtPartnerAcceptanceRequest(); - hqtPartnerAcceptanceRequest.setShopCode(shopInfoDO.getShopCode()); + hqtPartnerAcceptanceRequest.setHqtShopId(shopInfoDO.getHqtShopId()); hqtPartnerAcceptanceRequest.setSatisfaction(request.getSatisfaction()); hqtPartnerAcceptanceRequest.setComment(request.getPartnerAcceptance().getRemark()); hqtAPIService.hqtPartnerAcceptance(hqtPartnerAcceptanceRequest); @@ -761,7 +761,7 @@ public class DecorationServiceImpl implements DecorationService { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); //推送给HQT ConfirmQuotationRequest confirmQuotationRequest = new ConfirmQuotationRequest(); - confirmQuotationRequest.setShopCode(shopInfo.getShopCode()); + confirmQuotationRequest.setHqtShopId(shopInfo.getHqtShopId()); confirmQuotationRequest.setQuotationSheetId(decoration.getQuotationSheetId()); confirmQuotationRequest.setStatus(CommonConstants.ONE); hqtAPIService.confirmQuotation(confirmQuotationRequest); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index 66debbece..3f531ab7b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -2,6 +2,7 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.BigRegionDAO; +import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dto.HqtTokenDTO; import com.cool.store.entity.BigRegionDO; import com.cool.store.enums.ErrorCodeEnum; @@ -57,8 +58,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { @Resource OkHttpClient okHttpClient; @Resource - ObjectMapper objectMapper; - + private ShopInfoDAO shopInfoDAO; @Resource private BigRegionDAO bigRegionDAO; @@ -85,7 +85,8 @@ public class HqtAPIServiceImpl implements HqtAPIService { //资源服务URL String url = hqtToken.getEndPoint(); String requestUrl = url + "/v1/data/objects/project3X"; - sendPostRequest(JSONObject.toJSONString(hqtBuildAPIRequest), requestUrl, hqtToken); + HqtAPIResponse hqtAPIResponse = sendPostRequest(JSONObject.toJSONString(hqtBuildAPIRequest), requestUrl, hqtToken); + shopInfoDAO.updateHqtShopId(request.getShopId(), hqtAPIResponse.getData()); } @@ -100,7 +101,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { } //构建CRM系统门店编码（红圈通门店id） HqtQuotationSheetAPIRequest.Field1__c field1__c = new HqtQuotationSheetAPIRequest.Field1__c(); - field1__c.setCode(request.getShopCode()); + field1__c.setCode(request.getHqtShopId()); HqtTokenDTO hqtToken = this.getHqtToken(); String requestUrl = hqtToken.getEndPoint() + "/v1/data/objects/CustomObject77__c"; @@ -140,9 +141,9 @@ public class HqtAPIServiceImpl implements HqtAPIService { field1__c.setLabel(satisfactionEnum.getName()); field1__c.setName(satisfactionEnum.getHqtCode()); } - //门店编码 + //红圈通门店id HqtPartnerAcceptanceAPIRequest.Field13__c field13__c = new HqtPartnerAcceptanceAPIRequest.Field13__c(); - field13__c.setCode(request.getShopCode()); + field13__c.setCode(request.getHqtShopId()); apiRequest.setField1__c(field1__c); apiRequest.setField13__c(field13__c); @@ -183,7 +184,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { } String responseBody = response.body().string(); log.info("请求成功responseBody:{}",JSONObject.toJSONString(responseBody)); - HqtAPIResponse hqtAPIResponse = objectMapper.readValue(responseBody, HqtAPIResponse.class); + HqtAPIResponse hqtAPIResponse = JSONObject.parseObject(responseBody, HqtAPIResponse.class); return hqtAPIResponse; } catch (ServiceException e) { throw e; @@ -276,7 +277,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { "HTTP请求失败，状态码: " + response.code()); } String responseBody = response.body().string(); - HqtTokenDTO hqtTokenDTO = objectMapper.readValue(responseBody, HqtTokenDTO.class); + HqtTokenDTO hqtTokenDTO = JSONObject.parseObject(responseBody, HqtTokenDTO.class); return hqtTokenDTO; } catch (ServiceException e) { throw e; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 73d8e362d..879ff9780 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -303,6 +303,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { bigRegionDO = hqtAPIService.pushHqtRegion(bigRegionDO); } HqtBuildRequest request = new HqtBuildRequest(); + request.setShopId(shopId); request.setShopCode(shopInfo.getShopCode()); request.setShopName(shopInfo.getShopName()); request.setShopDecorationAttributes(shopInfo.getShopDecorationAttributes()); From 52839ab03e47e66813f8246a0f5c9fb56ef7c64b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 10:07:02 +0800 Subject: [PATCH 25/38] =?UTF-8?q?=E7=BA=A2=E5=9C=88=E9=80=9A=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/request/hqt/HqtQuotationSheetAPIRequest.java | 2 +- .../java/com/cool/store/service/impl/HqtAPIServiceImpl.java | 4 ++-- .../com/cool/store/service/impl/OrderSysInfoServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtQuotationSheetAPIRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtQuotationSheetAPIRequest.java index f4f863feb..b8f8ce02f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtQuotationSheetAPIRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtQuotationSheetAPIRequest.java @@ -17,7 +17,7 @@ public class HqtQuotationSheetAPIRequest { /** * @description:报价编号 */ - private String name; + private String name__c; @Data public static class Field1__c { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index 3f531ab7b..d8fc9dc42 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -104,11 +104,11 @@ public class HqtAPIServiceImpl implements HqtAPIService { field1__c.setCode(request.getHqtShopId()); HqtTokenDTO hqtToken = this.getHqtToken(); - String requestUrl = hqtToken.getEndPoint() + "/v1/data/objects/CustomObject77__c"; + String requestUrl = hqtToken.getEndPoint() + "/v1/data/objects/CustomObject638__c"; HqtQuotationSheetAPIRequest apiRequest = new HqtQuotationSheetAPIRequest(); apiRequest.setField1__c(field1__c); - apiRequest.setName(request.getQuotationSheetId()); + apiRequest.setName__c(request.getQuotationSheetId()); sendPostRequest(JSONObject.toJSONString(apiRequest), requestUrl, hqtToken); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 879ff9780..34cce643a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -115,7 +115,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { map.put("storeName", shopInfoDO.getShopName()); //自有店财务 UserRoleEnum finance = UserRoleEnum.FINANCE; - if (JoinModeEnum.OWN_STORE.equals(shopInfo.getJoinMode())) { + if (JoinModeEnum.OWN_STORE.getCode()==(shopInfo.getJoinMode())) { finance = UserRoleEnum.OWN_SHOP_OFFICE; } List itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(finance, shopInfoDO.getRegionId()); From 45cfc30e0cd19ca19073499f17c431bbf5ca2d49 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 10:10:39 +0800 Subject: [PATCH 26/38] fix --- .../src/main/resources/mapper/ShopInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 4dc2769da..230018d36 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -473,7 +473,7 @@ where a.id = #{shopId} - select id from xfsg_shop_info where deleted = 0 and line_id = #{lineId} and shop_code is not null From 67922fdf118725cc07d2762f12c96a9e1bca25ae Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 11:19:34 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/ConstructionOrderRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java index 04c5cd77b..a1eba33b8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java @@ -19,7 +19,7 @@ public class ConstructionOrderRequest { private String shopCode; @NotBlank(message = "施工派单ID(施工派单编号)不能为空") private String constructionOrderId; - @NotNull(message = "预计开工时间不能为空") + private Date constructionPlanStartTime; @NotNull(message = "预计完工时间不能为空") private Date constructionPlanEndTime; From b592d793f2bd593d526a02b1167ecda61143fe14 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 13:52:16 +0800 Subject: [PATCH 28/38] =?UTF-8?q?fix=20=E5=BB=BA=E5=BA=97=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E7=BB=AD=E9=98=B6=E6=AE=B5=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderSysInfoServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 34cce643a..c4d0d62bb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -254,28 +254,30 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { //回退 return shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_152); } + //测量阶段 + ShopStageInfoDO measurementStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_8_6); if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果不是毛泽军下级大区 直接完成不用总裁审批 if (!flag && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { - - if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode()) + && measurementStage.getShopSubStageStatus() .equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); + hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); } shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); stageCompletion(request.getShopId()); syncMainSysServer.syncStore(request.getShopId()); - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); return CommonConstants.ONE; } else { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); if (SHOP_SUB_STAGE_STATUS_156.equals(nextStatus)) { - if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode()) + && measurementStage.getShopSubStageStatus() .equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); + hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); } stageCompletion(request.getShopId()); - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); syncMainSysServer.syncStore(request.getShopId()); } return CommonConstants.ONE; From 71591e985a4124c2305e078ba5de0bb9fcd9c1b3 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 17:42:34 +0800 Subject: [PATCH 29/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/AssignDesignerRequest.java | 5 +- .../store/request/AssignQuotationRequest.java | 5 +- .../store/request/AssignSurveyorsRequest.java | 5 +- .../request/ConstructionCompletedRequest.java | 5 +- .../request/ConstructionOrderRequest.java | 4 +- .../request/DecorationDesignRequest.java | 3 + .../request/DecorationMeasureRequest.java | 6 ++ .../request/EntryConfirmationRequest.java | 4 +- .../HqtDecorationAcceptanceRequest.java | 4 +- .../request/SubmitDesignDrawingRequest.java | 7 +- .../request/SubmitMeasurementRequest.java | 4 +- .../request/SubmitQuotationSheetRequest.java | 5 +- .../store/request/hqt/HqtBuildAPIRequest.java | 4 ++ .../response/DecorationDesignResponse.java | 3 + .../cool/store/response/MeasureResponse.java | 4 ++ .../impl/DecorationDesignInfoServiceImpl.java | 55 ++++----------- .../impl/DecorationMeasureServiceImpl.java | 16 ++--- .../service/impl/DecorationServiceImpl.java | 4 ++ .../service/impl/OrderSysInfoServiceImpl.java | 47 ------------- .../service/impl/PreparationServiceImpl.java | 1 + .../impl/SignFranchiseServiceImpl.java | 68 +++++++++++++------ .../main/resources/application-ab.properties | 2 +- .../resources/application-online.properties | 2 +- .../resources/application-test.properties | 2 +- 24 files changed, 123 insertions(+), 142 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AssignDesignerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AssignDesignerRequest.java index 57dd4d290..461e87481 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AssignDesignerRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AssignDesignerRequest.java @@ -3,6 +3,7 @@ package com.cool.store.request; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @Author: WangShuo @@ -13,8 +14,8 @@ import javax.validation.constraints.NotBlank; @Data public class AssignDesignerRequest { - @NotBlank(message = "店铺编号不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "设计派单ID不能为空") private String designSheetId; @NotBlank(message = "设计师不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AssignQuotationRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AssignQuotationRequest.java index 2af487f61..26529fa96 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AssignQuotationRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AssignQuotationRequest.java @@ -3,6 +3,7 @@ package com.cool.store.request; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @Author: WangShuo @@ -13,8 +14,8 @@ import javax.validation.constraints.NotBlank; @Data public class AssignQuotationRequest { - @NotBlank(message = "门店编号不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "报价单编码不能为空") private String quotationSheetId; @NotBlank(message = "报价员不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AssignSurveyorsRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AssignSurveyorsRequest.java index 54e866660..530f2bfb1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AssignSurveyorsRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AssignSurveyorsRequest.java @@ -14,9 +14,8 @@ import javax.validation.constraints.NotNull; */ @Data public class AssignSurveyorsRequest { - @NotBlank(message = "门店编码不能为空") - private String shopCode; - + @NotNull(message = "crm门店id不能为空") + private Long shopId; @ApiModelProperty("测量单ID") @NotBlank(message = "测量单ID不能为空") private String measurementSheetId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionCompletedRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionCompletedRequest.java index c53893f37..2e6e3d512 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionCompletedRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionCompletedRequest.java @@ -3,6 +3,7 @@ package com.cool.store.request; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @Author: WangShuo @@ -12,8 +13,8 @@ import javax.validation.constraints.NotBlank; */ @Data public class ConstructionCompletedRequest { - @NotBlank(message = "门店编号不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "施工派单编号不能为空") private String constructionOrderId; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java index a1eba33b8..811ad5d8d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java @@ -15,8 +15,8 @@ import java.util.Date; @Data public class ConstructionOrderRequest { - @NotBlank(message = "门店编号不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "施工派单ID(施工派单编号)不能为空") private String constructionOrderId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java index 9480fa525..97c5166ca 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java @@ -23,6 +23,9 @@ public class DecorationDesignRequest { @ApiModelProperty("店铺ID") private Long shopId; + @ApiModelProperty(value = "设计派单ID") + private String designSheetId; + @ApiModelProperty("设计组长ID") private String designLeaderId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationMeasureRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationMeasureRequest.java index 48cb7f2e9..89cf74bb9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationMeasureRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationMeasureRequest.java @@ -38,6 +38,11 @@ public class DecorationMeasureRequest { @ApiModelProperty("备注") private String remark; + @ApiModelProperty("测量派单ID") + private String measurementSheetId; + + + /** * 构建DecorationMeasureDO * @@ -52,6 +57,7 @@ public class DecorationMeasureRequest { decorationMeasureDO.setDiagramDate(this.diagramDate); decorationMeasureDO.setMeasureUrl(this.measureUrl); decorationMeasureDO.setRemark(this.remark); + decorationMeasureDO.setMeasurementSheetId(this.measurementSheetId); return decorationMeasureDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/EntryConfirmationRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/EntryConfirmationRequest.java index 453371cdc..9d9cb9109 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/EntryConfirmationRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/EntryConfirmationRequest.java @@ -14,8 +14,8 @@ import java.util.Date; */ @Data public class EntryConfirmationRequest { - @NotBlank(message = "门店编号不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; //施工派单ID(施工派单编号) @NotBlank(message = "施工派单编号不能为空") private String constructionOrderId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java index 56fbf08fe..791dcd009 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java @@ -17,8 +17,8 @@ import java.util.List; */ @Data public class HqtDecorationAcceptanceRequest { - @NotBlank(message = "门店编号不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "完工交付单ID (完工编号)不能为空") private String deliveryOrderId; @NotEmpty(message = "验收单不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitDesignDrawingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitDesignDrawingRequest.java index 2b925884d..0018da3f4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitDesignDrawingRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitDesignDrawingRequest.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -14,10 +15,8 @@ import java.util.List; */ @Data public class SubmitDesignDrawingRequest { - - @NotBlank(message = "门店编号不能为空") - private String shopCode; - + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "设计派单ID不能为空") private String designSheetId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitMeasurementRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitMeasurementRequest.java index 609bc86ee..f1c184b60 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitMeasurementRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitMeasurementRequest.java @@ -17,8 +17,8 @@ import java.util.List; @Data public class SubmitMeasurementRequest { - @NotBlank(message = "门店编码不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotNull(message = "测量日期不能为空") private Date measureDate; @NotNull(message = "出图日期不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitQuotationSheetRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitQuotationSheetRequest.java index 25751b399..f33060bd6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitQuotationSheetRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitQuotationSheetRequest.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -14,8 +15,8 @@ import java.util.List; */ @Data public class SubmitQuotationSheetRequest { - @NotBlank(message = "门店编码不能为空") - private String shopCode; + @NotNull(message = "crm门店id不能为空") + private Long shopId; @NotBlank(message = "报价单ID(报价单编号)不能为空") private String quotationSheetId; @NotEmpty(message = "报价单附件不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java index 19bdb55a2..0abe459a1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java @@ -91,6 +91,10 @@ public class HqtBuildAPIRequest { @JsonProperty("field4__c") private String field4__c; + //是否对接CRM + @JsonProperty("field180__c") + private String field180__c = "crm"; + @Data public static class Field124__c { /** diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/DecorationDesignResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/DecorationDesignResponse.java index 1ce7da2fb..a0170913b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/DecorationDesignResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/DecorationDesignResponse.java @@ -19,8 +19,10 @@ public class DecorationDesignResponse { private String designSheetId; @ApiModelProperty(value = "设计组长名称") private String designLeaderName; + private String designLeaderId; @ApiModelProperty(value = "设计师名称") private String designName; + private String designUserId; @ApiModelProperty("设计图URL") private String designUrl; @ApiModelProperty(value = "原始照片") @@ -35,6 +37,7 @@ public class DecorationDesignResponse { private String quotationSheetId; @ApiModelProperty(value = "报价员") private String quoter; + private String quotationUserId; @ApiModelProperty(value = "报价单") private String quotationUrl; @ApiModelProperty(value = "报价提交时间") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/MeasureResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/MeasureResponse.java index 6776ad916..a73819158 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/MeasureResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/MeasureResponse.java @@ -21,9 +21,13 @@ public class MeasureResponse { @ApiModelProperty("测量员") private String measureUserName; + private String measureUserId; + @ApiModelProperty("设计组") private String designLeaderName; + private String designUserId; + @ApiModelProperty("测量日期") private Date measureDate; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java index 836659137..5927b1152 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java @@ -43,11 +43,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean assignDesigner(AssignDesignerRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -80,11 +77,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitDesignDrawing(SubmitDesignDrawingRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -110,11 +104,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean assignQuotation(AssignQuotationRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -137,11 +128,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitQuotationSheet(SubmitQuotationSheetRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -168,11 +156,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitConstructionOrder(ConstructionOrderRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -194,11 +179,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean entryConfirmation(EntryConfirmationRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -219,11 +201,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean constructionCompleted(ConstructionCompletedRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -244,11 +223,7 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean decorationAcceptance(HqtDecorationAcceptanceRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 2e263763d..43b9d03a8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -179,11 +179,8 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { @Override public Boolean assignSurveyors(AssignSurveyorsRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -229,11 +226,8 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { @Override public Boolean submitMeasurementDiagram(SubmitMeasurementRequest request) { - Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); - if(numByShopCode > 1){ - throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); - } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); + + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } @@ -263,12 +257,14 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { if (StringUtils.isBlank(measureDAOByShopId.getMeasureUserName()) && StringUtils.isNotBlank(measureDAOByShopId.getMeasureUserId())) { response.setMeasureUserName(enterpriseUserDAO.getUserName(measureDAOByShopId.getMeasureUserId())); + response.setMeasureUserId(measureDAOByShopId.getMeasureUserId()); } else { response.setMeasureUserName(measureDAOByShopId.getMeasureUserName()); } if (StringUtils.isBlank(measureDAOByShopId.getDesignLeaderName()) && StringUtils.isNotBlank(measureDAOByShopId.getDesignUserId())) { response.setDesignLeaderName(enterpriseUserDAO.getUserName(measureDAOByShopId.getDesignUserId())); + response.setDesignUserId(measureDAOByShopId.getDesignUserId()); } else { response.setDesignLeaderName(measureDAOByShopId.getDesignLeaderName()); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 4fb07c6b0..b26dbeb8e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -650,6 +650,7 @@ public class DecorationServiceImpl implements DecorationService { if (StringUtils.isNotBlank(measureDO.getDesignUserId()) && StringUtils.isBlank(measureDO.getDesignLeaderName())) { String userName = enterpriseUserDAO.getUserName(measureDO.getDesignUserId()); response.setDesignLeaderName(userName); + response.setDesignLeaderId(measureDO.getDesignUserId()); } else { response.setDesignLeaderName(measureDO.getDesignLeaderName()); } @@ -659,11 +660,13 @@ public class DecorationServiceImpl implements DecorationService { response.setDesignSheetId(decoration.getDesignSheetId()); if (StringUtils.isNotBlank(decoration.getDesignUserId()) && StringUtils.isBlank(decoration.getDesignName())) { response.setDesignName(enterpriseUserDAO.getUserName(decoration.getDesignUserId())); + response.setDesignUserId(decoration.getDesignUserId()); } else { response.setDesignName(decoration.getDesignName()); } if (StringUtils.isNotBlank(decoration.getDesignLeaderId()) && StringUtils.isBlank(decoration.getDesignLeaderName())) { String userName = enterpriseUserDAO.getUserName(decoration.getDesignLeaderId()); + response.setDesignLeaderId(decoration.getDesignLeaderId()); response.setDesignLeaderName(userName); } else { response.setDesignLeaderName(decoration.getDesignLeaderName()); @@ -678,6 +681,7 @@ public class DecorationServiceImpl implements DecorationService { if (StringUtils.isNotBlank(decoration.getQuotationUserId()) && StringUtils.isBlank(decoration.getQuoter())) { String userName = enterpriseUserDAO.getUserName(decoration.getQuotationUserId()); response.setQuoter(userName); + response.setQuotationUserId(decoration.getQuotationUserId()); } else { response.setQuoter(decoration.getQuoter()); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index c4d0d62bb..c658e1f14 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -259,11 +259,6 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果不是毛泽军下级大区 直接完成不用总裁审批 if (!flag && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { - if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode()) - && measurementStage.getShopSubStageStatus() .equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); - } shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); stageCompletion(request.getShopId()); syncMainSysServer.syncStore(request.getShopId()); @@ -272,11 +267,6 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } else { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), nextStatus); if (SHOP_SUB_STAGE_STATUS_156.equals(nextStatus)) { - if (!shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode()) - && measurementStage.getShopSubStageStatus() .equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_861); - hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); - } stageCompletion(request.getShopId()); syncMainSysServer.syncStore(request.getShopId()); } @@ -285,43 +275,6 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } return 0; } - public void updateDecorationStage(Long shopId){ - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); - if (shopInfo.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { - //老店新开时装修与开业直接完成 - shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList( - SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 - )); - - } - } - - 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()); - if (StringUtils.isBlank(bigRegionDO.getHqtRegionCode())){ - bigRegionDO = hqtAPIService.pushHqtRegion(bigRegionDO); - } - 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; - } void sendSms(Long shopId, List userIds) { ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(shopId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index b1c786bae..09a5aa02f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -204,6 +204,7 @@ public class PreparationServiceImpl implements PreparationService { list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1); + list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 0d4fd1023..b632b8deb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -12,10 +12,7 @@ import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.*; -import com.cool.store.request.AddSignFranchiseRequest; -import com.cool.store.request.AuditApproveRequest; -import com.cool.store.request.AuditResultRequest; -import com.cool.store.request.FranchiseAgreementRequest; +import com.cool.store.request.*; import com.cool.store.response.AddSignFranchiseResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.*; @@ -44,6 +41,16 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; @Slf4j public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResultService { + @Resource + private BigRegionDAO bigRegionDAO; + @Resource + private ShopInfoDAO shopInfoDAO; + @Resource + private LineInfoDAO lineInfoDAO; + @Resource + private EnterpriseUserDAO enterpriseUserDAO; + @Resource + private HqtAPIService hqtAPIService; @Resource private RegionDao regionDao; @Resource @@ -344,19 +351,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS); if (Boolean.TRUE.equals(acquired)) { ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); - ShopSubStageStatusEnum shopSubStageStatusEnum = null; - if (request.getAuditResult() == 1) { - shopSubStageStatusEnum = SHOP_SUB_STAGE_STATUS_84; - if (shopInfoDO.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { - //老店新开时装修与开业直接完成 - shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList( - SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 - )); - - } - } else if (request.getAuditResult() == 0) { - shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85; - } ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(shopId); shopAuditInfoDO.setAuditType(AuditTypeEnum.SIGN_FRANCHISE.getCode()); @@ -368,7 +362,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopAuditInfoDO.setRejectReason(request.getCause()); Map requestMap = new HashMap<>(); LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); - shopStageInfoDAO.updateShopStageInfo(shopId, shopSubStageStatusEnum); + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85); Set auditFranchiseFeeUsers = new HashSet<>(); List branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, shopInfoDO.getRegionId()); if (Objects.nonNull(branchUser)) { @@ -387,6 +381,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(new ArrayList<>(auditFranchiseFeeUsers), MessageEnum.MESSAGE_20, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { + if (shopInfoDO.getShopDecorationAttributes().equals(ShopDecorationAttributesEnum.OLD_NEW_OPEN.getCode())) { + //老店新开时装修与开业直接完成 + shopStageInfoDAO.batchUpdateByShopIdsAndSubStageStatus(Arrays.asList(shopId), Arrays.asList( + SHOP_SUB_STAGE_STATUS_863, SHOP_SUB_STAGE_STATUS_91, SHOP_SUB_STAGE_STATUS_112, SHOP_SUB_STAGE_STATUS_123, SHOP_SUB_STAGE_STATUS_143 + )); + }else{ + hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); + + } shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); //更新状态为加盟商 @@ -394,7 +397,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //暂时去掉 lineInfoDO.setJoinStatus(CommonConstants.TWO); lineInfoMapper.insertOrUpdate(lineInfoDO); - shopStageInfoDAO.updateShopStageInfo(shopId, shopSubStageStatusEnum); + shopStageInfoDAO.updateShopStageInfo(shopId, SHOP_SUB_STAGE_STATUS_84); //初始化数据 preparationService.contractAndBuildStoreCompletion(request.getShopId()); @@ -441,6 +444,33 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } } + 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()); + if (StringUtils.isBlank(bigRegionDO.getHqtRegionCode())){ + bigRegionDO = hqtAPIService.pushHqtRegion(bigRegionDO); + } + 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; + } + public AddSignFranchiseResponse from(SignFranchiseDO signFranchiseDO, Long shopId) { AddSignFranchiseResponse addSignFranchiseResponse = new AddSignFranchiseResponse(); diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties index f4b319460..bbeda82e7 100644 --- a/coolstore-partner-web/src/main/resources/application-ab.properties +++ b/coolstore-partner-web/src/main/resources/application-ab.properties @@ -84,7 +84,7 @@ enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f hqt.token.url=https://tc.cloud.hecom.cn -hqt.token.username=18820154831 +hqt.token.username=18161486722 hqt.token.grant_type=client_credentials hqt.token.client.id=WrPffdGpcWkcPsbN hqt.token.client.secret=rYe9Cwug5LwQNIBJAiW0a7weF9CAhYCD diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 5bde8657b..ae1f91591 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -131,7 +131,7 @@ special.user.id=wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g_woayJeDAAAtwLSAPVMWbpGi9q4caSuj ask.bot.url=https://auth.wx.askbot.cn hqt.token.url=https://tc.cloud.hecom.cn -hqt.token.username=18820154831 +hqt.token.username=18161486722 hqt.token.grant_type=client_credentials hqt.token.client.id=WrPffdGpcWkcPsbN hqt.token.client.secret=rYe9Cwug5LwQNIBJAiW0a7weF9CAhYCD \ No newline at end of file diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 3cca3b741..57aa32c47 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -136,7 +136,7 @@ ask.bot.url=https://test.auth.wx.askbot.cn hqt.token.url=https://tc.cloud.hecom.cn -hqt.token.username=18820154831 +hqt.token.username=18161486722 hqt.token.grant_type=client_credentials hqt.token.client.id=WrPffdGpcWkcPsbN hqt.token.client.secret=rYe9Cwug5LwQNIBJAiW0a7weF9CAhYCD From 0bfbfd4fe345f0fa247817fe9b8879d318cc2eb8 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 17:46:51 +0800 Subject: [PATCH 30/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/HqtAPIServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index d8fc9dc42..cd45d4f05 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -196,7 +196,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { private static void getHqtBuildAPIRequest(HqtBuildRequest request, HqtBuildAPIRequest hqtBuildAPIRequest, HqtBuildAPIRequest.Field13__c field13__c, HqtBuildAPIRequest.Field124__c field124__c, HqtBuildAPIRequest.Field8__c field8__c, HqtBuildAPIRequest.Field123__c field123__c) { - hqtBuildAPIRequest.setProjectNo(request.getShopCode()); + hqtBuildAPIRequest.setProjectNo(request.getShopId().toString()); hqtBuildAPIRequest.setName(request.getShopName()); hqtBuildAPIRequest.setField13__c(field13__c); hqtBuildAPIRequest.setField124__c(field124__c); From 0cc58a252e3ee79dec59bc04f7f6e00d6cc44003 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 17:53:36 +0800 Subject: [PATCH 31/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B0=83=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/HqtBuildRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java index e55f75d32..a7d532e7f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtBuildRequest.java @@ -40,11 +40,11 @@ public class HqtBuildRequest { private Integer franchiseBrand; public Boolean check(){ - if (StringUtils.isAnyBlank(shopCode,shopName,hqtRegionCode,hqtRegionName,supervisorName, + if (StringUtils.isAnyBlank(shopName,hqtRegionCode,hqtRegionName,supervisorName, supervisorMobile,partnershipSignatoryFirst,partnershipSignatoryFirstMobile,shopAddress)){ return false; } - if (Objects.isNull(isPayDesignFee)|| Objects.isNull(franchiseBrand)|| Objects.isNull(shopDecorationAttributes)){ + if (Objects.isNull(isPayDesignFee)|| Objects.isNull(franchiseBrand)|| Objects.isNull(shopDecorationAttributes) || Objects.isNull(shopId)){ return false; } return true; From fe13e9edfa7c594474d529c1803edb5613a638e0 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 19:20:13 +0800 Subject: [PATCH 32/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/ShopInfoDAO.java | 4 ++ .../com/cool/store/mapper/ShopInfoMapper.java | 3 ++ .../main/resources/mapper/ShopInfoMapper.xml | 11 +++++ .../cool/store/service/DataHandlerServer.java | 7 ++++ .../com/cool/store/service/ShopService.java | 2 + .../service/impl/DataHandlerServerImpl.java | 41 +++++++++++++++++++ .../store/service/impl/ShopServiceImpl.java | 12 ++++++ .../webb/DataHandlerController.java | 7 ++++ .../controller/webb/PCShopController.java | 6 +++ 9 files changed, 93 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index baaf1f884..439afb1ee 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -355,4 +355,8 @@ public class ShopInfoDAO { } return shopInfoMapper.updateHqtShopId(shopId, hqtShopId); } + //查询 需要推送红圈通的门店 + public List getPushHqtShopList(){ + return shopInfoMapper.getPushHqtShopList(); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index addfddfde..4fb584096 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -150,4 +150,7 @@ public interface ShopInfoMapper extends Mapper { Integer getNumByShopCode(@Param("shopCode") String shopCode); Integer updateHqtShopId(@Param("shopId") Long shopId,@Param("hqtShopId") String hqtShopId); + + List getPushHqtShopList(); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 230018d36..20bb1dbd7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -563,6 +563,17 @@ + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java index 56b1a2c48..c83e841af 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java @@ -83,4 +83,11 @@ public interface DataHandlerServer { */ void dataHandlerCreateStore(); + /** + * @Auther: wangshuo + * @Date: 2025/8/6 + * @description: 处理数据推送红圈通建店 + */ + void dataHandlerPushHqt(); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 4a0a15c44..8e7d0fb54 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -140,4 +140,6 @@ public interface ShopService { * @description: 校验门店编码重复 */ Boolean checkShopCodeRepeat(String shopCode,Long shopId); + + Boolean isShowButton(Long shopId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java index 650abffd2..5c26489ea 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java @@ -16,6 +16,7 @@ import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.*; +import com.cool.store.request.HqtBuildRequest; import com.cool.store.request.QueryBigRegionRequest; import com.cool.store.service.*; import com.cool.store.utils.StringUtil; @@ -49,6 +50,8 @@ import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD; @Service @Slf4j public class DataHandlerServerImpl implements DataHandlerServer { + @Resource + private HqtAPIService hqtAPIService; @Resource private RegionMapper regionMapper; @Resource @@ -1258,6 +1261,44 @@ public class DataHandlerServerImpl implements DataHandlerServer { } + @Override + public void dataHandlerPushHqt() { + List pushHqtShopList = shopInfoDAO.getPushHqtShopList(); + for (ShopInfoDO shopInfoDO : pushHqtShopList) { + try{ + hqtAPIService.pushHqtBuild(getHqtBuildRequest(shopInfoDO.getId())); + }catch (Exception e){ + log.info("推送HQT失败:shopId:{},mes:{}",shopInfoDO.getId(),e.getMessage()); + } + } + } + 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()); + if (com.cool.store.utils.poi.StringUtils.isBlank(bigRegionDO.getHqtRegionCode())){ + bigRegionDO = hqtAPIService.pushHqtRegion(bigRegionDO); + } + 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 (com.cool.store.utils.poi.StringUtils.isNotBlank(shopInfo.getFranchiseBrand())) { + request.setFranchiseBrand(Integer.valueOf(shopInfo.getFranchiseBrand())); + } + return request; + } + private static @NotNull ShopStageInfoDO getShopStageInfoDO(ShopSubStageEnum shopSubStageEnum, ShopStageInfoDO shopStageInfoDO, ShopSubStageStatusEnum shopSubStageStatus) { ShopStageEnum shopStageEnum = shopSubStageEnum.getShopStageEnum(); ShopStageInfoDO shopStageInfo = new ShopStageInfoDO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 77ba672a5..a7cfeb075 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -60,6 +60,8 @@ import static com.cool.store.enums.WorkflowSubStageStatusEnum.*; @Slf4j public class ShopServiceImpl implements ShopService { + @Resource + private DecorationMeasureDAO decorationMeasureDAO; @Resource private LinePayDAO linePayDAO; @Resource @@ -917,6 +919,16 @@ public class ShopServiceImpl implements ShopService { return true; } + @Override + public Boolean isShowButton(Long shopId) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + //店已关联HQT 不展示按钮 + if (StringUtils.isNotBlank(shopInfo.getHqtShopId())){ + return false; + } + return true; + } + /** * 获取招商经理信息 * @param diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java index f56e8bc95..62fb578e0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java @@ -184,4 +184,11 @@ public class DataHandlerController { dataHandlerServer.dataHandlerCreateStore(); return ResponseResult.success(true); } + + @ApiOperation("红圈通数据处理") + @GetMapping("/dataHandlerPushHqt") + public ResponseResult dataHandlerPushHqt(){ + dataHandlerServer.dataHandlerPushHqt(); + return ResponseResult.success(true); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java index 60eaef521..d267338c4 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java @@ -171,4 +171,10 @@ public class PCShopController { public ResponseResult getShopStageStatus(@RequestParam("shopId")Long shopId, @RequestParam("subStage")Integer subStage) { return ResponseResult.success(shopService.getShopStageStatus(shopId, subStage)); } + + @ApiOperation("是否展示装修阶段按钮") + @GetMapping("/isShowButton") + public ResponseResult isShowButton(@RequestParam("shopId")Long shopId) { + return ResponseResult.success(shopService.isShowButton(shopId)); + } } From 91c14e3b514f3818d3f6b621fb76973bec0dac8d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 6 Aug 2025 19:21:51 +0800 Subject: [PATCH 33/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/ShopServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index a7cfeb075..1046f8d18 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -107,8 +107,6 @@ public class ShopServiceImpl implements ShopService { @Resource StoreDao storeDao; @Resource - DecorationMeasureDAO decorationMeasureDAO; - @Resource DecorationDesignInfoDAO decorationDesignInfoDAO; @Resource StoreService storeService; From c91500f90470fd72f7225a5570bc682907ff0947 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 7 Aug 2025 11:19:15 +0800 Subject: [PATCH 34/38] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../store/request/ConstructionRequest.java | 7 +- .../request/DecorationDesignRequest.java | 5 + .../store/request/ThreeAcceptanceRequest.java | 5 + .../service/DecorationDesignInfoService.java | 16 +-- .../service/DecorationMeasureService.java | 4 +- .../impl/DecorationDesignInfoServiceImpl.java | 25 ++++ .../impl/DecorationMeasureServiceImpl.java | 6 + .../service/impl/DecorationServiceImpl.java | 119 +++++++++++------- 9 files changed, 129 insertions(+), 59 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 7a9d81b78..d62aa0fbc 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -235,6 +235,7 @@ public enum ErrorCodeEnum { DESIGN_NO_COMPLETE(121007,"请先完成设计阶段！",null), SIGN_COMPLETED(121008,"你已完成验收,无需重复操作！",null), SHOP_CODE_EXIST(121009,"存在重复门店编码，请联系CRM工作人员处理",null), + HQT_SHOP_ID_NOT_EXIST(121010,"红圈通门店id为空，该门店双方系统未互通",null), UPDATE_FAIL(131000,"修改失败，表单不存在！",null), LICENSE_LEGAL_STAGE_FAIL(131001,"营业执照阶段未上传！",null), diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionRequest.java index f9e923b96..a281028c9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionRequest.java @@ -3,6 +3,8 @@ package com.cool.store.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author suzhuhong * @Date 2024/10/10 10:37 @@ -13,7 +15,8 @@ public class ConstructionRequest { private Long shopId; - + @ApiModelProperty("施工派单id") + private String constructionOrderId; @ApiModelProperty("装修计划开始时间") private Long constructionPlanStartTime; @ApiModelProperty("装修计划结束时间") @@ -22,4 +25,6 @@ public class ConstructionRequest { private String constructionAnnex; @ApiModelProperty("装修备注") private String constructionRemark; + //进场时间 + private Date actualEntryTime; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java index 97c5166ca..60459e055 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java @@ -32,6 +32,9 @@ public class DecorationDesignRequest { @ApiModelProperty("设计师ID") private String designUserId; + @ApiModelProperty(value = "报价单ID(报价单编号)") + private String quotationSheetId; + @ApiModelProperty("报价员ID") private String quotationUserId; @@ -58,6 +61,8 @@ public class DecorationDesignRequest { DecorationDesignInfoDO decorationDesignInfoDO = new DecorationDesignInfoDO(); decorationDesignInfoDO.setDesignUrl(this.designUrl); decorationDesignInfoDO.setShopId(this.shopId); + decorationDesignInfoDO.setDesignSheetId(this.designSheetId); + decorationDesignInfoDO.setQuotationSheetId(this.quotationSheetId); if (this.designLeaderId != null) { decorationDesignInfoDO.setDesignLeaderId(this.designLeaderId); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java index bdfb0e929..0ebaa2cd7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; import javax.persistence.Column; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.List; /** @@ -50,6 +51,10 @@ public class ThreeAcceptanceRequest { @ApiModelProperty("后厨照片") private String backKitchenPhoto; + @ApiModelProperty("完工交付单ID ") + private String deliveryOrderId; + @ApiModelProperty("增减项金额") + private BigDecimal addReduceAmount; public Boolean miniCheck(){ if (StringUtils.isAnyBlank(this.partnerAcceptance.toString())|| ObjectUtils.anyNull(this.satisfaction,this.isNetworkCable)){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationDesignInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationDesignInfoService.java index aab1df30d..e85acd618 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationDesignInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationDesignInfoService.java @@ -11,54 +11,54 @@ public interface DecorationDesignInfoService { /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:分配设计师 + * @description: 红圈通 hqt分配设计师 */ Boolean assignDesigner(AssignDesignerRequest request); /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:上传设计图 + * @description: 红圈通hqt上传设计图 */ Boolean submitDesignDrawing(SubmitDesignDrawingRequest request); /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:分配报价员 + * @description: 红圈通hqt 分配报价员 */ Boolean assignQuotation(AssignQuotationRequest request); /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:上传最终报价单 + * @description:红圈通上传最终报价单 */ Boolean submitQuotationSheet(SubmitQuotationSheetRequest request); /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:施工派单 + * @description:红圈通施工派单 */ Boolean submitConstructionOrder(ConstructionOrderRequest request); /** * @Auther: wangshuo * @Date: 2025/7/24 - * @description:实际进场确认 + * @description:红圈通实际进场确认 */ Boolean entryConfirmation (EntryConfirmationRequest request); /** * @Auther: wangshuo * @Date: 2025/7/24 - * @description:施工完成 + * @description:红圈通施工完成 */ Boolean constructionCompleted (ConstructionCompletedRequest request); /** * @Auther: wangshuo * @Date: 2025/7/24 - * @description: 装修验收 + * @description: 红圈通装修验收 */ Boolean decorationAcceptance(HqtDecorationAcceptanceRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationMeasureService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationMeasureService.java index 23d52568d..251b121d9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationMeasureService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationMeasureService.java @@ -35,14 +35,14 @@ public interface DecorationMeasureService { /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:分配测量员 设计组 + * @description: hqt 分配测量员 设计组 */ Boolean assignSurveyors(AssignSurveyorsRequest request); /** * @Auther: wangshuo * @Date: 2025/7/23 - * @description:门店测量、上传测量图 + * @description: hqt门店测量、上传测量图 */ Boolean submitMeasurementDiagram(SubmitMeasurementRequest request); /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java index 5927b1152..03b389bef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.*; import com.cool.store.service.DecorationDesignInfoService; +import com.cool.store.utils.poi.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,6 +49,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfoDO.getId(), ShopSubStageEnum.SHOP_STAGE_9); if (shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -82,6 +86,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } DecorationDesignInfoDO designInfoDO = decorationDesignInfoDAO.getByShopId(shopInfoDO.getId()); if (designInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -109,6 +116,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } DecorationDesignInfoDO designInfoDO = decorationDesignInfoDAO.getByShopId(shopInfoDO.getId()); if (designInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -133,6 +143,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); DecorationDesignInfoDO designInfoDO = decorationDesignInfoDAO.getByShopId(shopInfoDO.getId()); if (designInfoDO == null) { @@ -161,6 +174,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } DecorationDesignInfoDO designInfoDO = decorationDesignInfoDAO.getByShopId(shopInfoDO.getId()); if (designInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -184,6 +200,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } DecorationDesignInfoDO designInfoDO = decorationDesignInfoDAO.getByShopId(shopInfoDO.getId()); if (designInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -206,6 +225,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } DecorationDesignInfoDO designInfoDO = decorationDesignInfoDAO.getByShopId(shopInfoDO.getId()); if (designInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -227,6 +249,9 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfoDO.getId(), ShopSubStageEnum.SHOP_STAGE_12); if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()) && !shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123.getShopSubStageStatus())) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 43b9d03a8..0bc63f1c6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -184,6 +184,9 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfoDO.getId(), ShopSubStageEnum.SHOP_STAGE_8_6); if (shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); @@ -231,6 +234,9 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } + if (StringUtils.isEmpty(shopInfoDO.getHqtShopId())){ + throw new ServiceException(ErrorCodeEnum.HQT_SHOP_ID_NOT_EXIST); + } DecorationMeasureDO measureDAOByShopId = decorationMeasureDAO.getByShopId(shopInfoDO.getId()); if (measureDAOByShopId == null) { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index b26dbeb8e..271ffbebc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -375,24 +375,27 @@ public class DecorationServiceImpl implements DecorationService { //更新阶段状态验收中 ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); - HqtPartnerAcceptanceRequest hqtPartnerAcceptanceRequest = new HqtPartnerAcceptanceRequest(); - hqtPartnerAcceptanceRequest.setHqtShopId(shopInfoDO.getHqtShopId()); - hqtPartnerAcceptanceRequest.setSatisfaction(request.getSatisfaction()); - hqtPartnerAcceptanceRequest.setComment(request.getPartnerAcceptance().getRemark()); - hqtAPIService.hqtPartnerAcceptance(hqtPartnerAcceptanceRequest); + if (StringUtils.isNotBlank(shopInfoDO.getHqtShopId())) { + HqtPartnerAcceptanceRequest hqtPartnerAcceptanceRequest = new HqtPartnerAcceptanceRequest(); + hqtPartnerAcceptanceRequest.setHqtShopId(shopInfoDO.getHqtShopId()); + hqtPartnerAcceptanceRequest.setSatisfaction(request.getSatisfaction()); + hqtPartnerAcceptanceRequest.setComment(request.getPartnerAcceptance().getRemark()); + hqtAPIService.hqtPartnerAcceptance(hqtPartnerAcceptanceRequest); + }else{ + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + List sendUsers = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.CONSTRUCTION_CUSTOMER, shopInfoDO.getRegionId()); + if (CollectionUtils.isNotEmpty(sendUsers)) { + List sendUserIds = sendUsers.stream().map(enterpriseUserDO -> enterpriseUserDO.getUserId()).collect(Collectors.toList()); + HashMap map = new HashMap<>(); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfoDO.getShopName()); + commonService.sendQWMessage(sendUserIds, + MessageEnum.MESSAGE_37, + map); + } + } } - //LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); -// List sendUsers = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.CONSTRUCTION_CUSTOMER, shopInfoDO.getRegionId()); -// if (CollectionUtils.isNotEmpty(sendUsers)) { -// List sendUserIds = sendUsers.stream().map(enterpriseUserDO -> enterpriseUserDO.getUserId()).collect(Collectors.toList()); -// HashMap map = new HashMap<>(); -// map.put("partnerUsername", lineInfoDO.getUsername()); -// map.put("partnerMobile", lineInfoDO.getMobile()); -// map.put("storeName", shopInfoDO.getShopName()); -// commonService.sendQWMessage(sendUserIds, -// MessageEnum.MESSAGE_37, -// map); -// } return Boolean.TRUE; } @@ -561,6 +564,11 @@ public class DecorationServiceImpl implements DecorationService { if (Objects.isNull(request) || request.getShopId() == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } + Boolean flag = true; + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + if (StringUtils.isNotBlank(shopInfo.getHqtShopId())) { + flag = false; + } DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); @@ -576,32 +584,37 @@ public class DecorationServiceImpl implements DecorationService { decorationDesignInfoDO.setQuotationSubmitTime(new Date()); } decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901); // 给设计师发送企业微信消息 - // sendMeasureUserMessage(request.getShopId(), decorationDesignInfoDO.getDesignUserId(), MessageEnum.MESSAGE_55); + if (flag) { + sendMeasureUserMessage(request.getShopId(), decorationDesignInfoDO.getDesignUserId(), MessageEnum.MESSAGE_55); + } return Boolean.TRUE; } if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902); -// List quotationOfficeList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.QUOTATION_OFFICE.getCode())); -// HashMap map = new HashMap<>(4); -// map.put("partnerUsername", lineInfo.getUsername()); -// map.put("partnerMobile", lineInfo.getMobile()); -// map.put("storeName", shopInfo.getShopName()); -// commonService.sendQWMessage( -// quotationOfficeList, -// MessageEnum.MESSAGE_59, -// map -// ); + if (flag) { + List quotationOfficeList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.QUOTATION_OFFICE.getCode())); + HashMap map = new HashMap<>(4); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage( + quotationOfficeList, + MessageEnum.MESSAGE_59, + map + ); + } return Boolean.TRUE; } if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_903); // 给报价员发送企业微信消息 - // sendMeasureUserMessage(request.getShopId(), request.getQuotationUserId(), MessageEnum.MESSAGE_55); + if (flag) { + sendMeasureUserMessage(request.getShopId(), request.getQuotationUserId(), MessageEnum.MESSAGE_55); + } return Boolean.TRUE; } //更新设计阶段状态=待确认，装修子流程=待进场 @@ -611,17 +624,19 @@ public class DecorationServiceImpl implements DecorationService { templateParam.put("shopName", shopInfo.getShopName()); commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam); // 发送企业微信消息 -// List sendUsers = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.CONSTRUCTION_CUSTOMER, shopInfo.getRegionId()); -// if (CollectionUtils.isNotEmpty(sendUsers)) { -// List sendUserIds = sendUsers.stream().map(enterpriseUserDO -> enterpriseUserDO.getUserId()).collect(Collectors.toList()); -// HashMap map = new HashMap<>(); -// map.put("partnerUsername", lineInfo.getUsername()); -// map.put("partnerMobile", lineInfo.getMobile()); -// map.put("storeName", shopInfo.getShopName()); -// commonService.sendQWMessage(sendUserIds, -// MessageEnum.MESSAGE_37, -// map); -// } + if (flag) { + List sendUsers = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.CONSTRUCTION_CUSTOMER, shopInfo.getRegionId()); + if (CollectionUtils.isNotEmpty(sendUsers)) { + List sendUserIds = sendUsers.stream().map(enterpriseUserDO -> enterpriseUserDO.getUserId()).collect(Collectors.toList()); + HashMap map = new HashMap<>(); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage(sendUserIds, + MessageEnum.MESSAGE_37, + map); + } + } return Boolean.TRUE; } } else { @@ -631,7 +646,9 @@ public class DecorationServiceImpl implements DecorationService { //更新装修设计状态 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901); // 给设计师发送企业微信消息 - // sendMeasureUserMessage(request.getShopId(), decorationDesignInfoDO.getDesignUserId(), MessageEnum.MESSAGE_55); + if (flag) { + sendMeasureUserMessage(request.getShopId(), decorationDesignInfoDO.getDesignUserId(), MessageEnum.MESSAGE_55); + } } return Boolean.TRUE; } @@ -709,6 +726,8 @@ public class DecorationServiceImpl implements DecorationService { throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); } DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); + decoration.setConstructionOrderId(request.getConstructionOrderId()); + decoration.setActualEntryTime(request.getActualEntryTime()); decoration.setConstructionAnnex(request.getConstructionAnnex()); decoration.setConstructionRemark(request.getConstructionRemark()); decoration.setConstructionPlanStartTime(new Date(request.getConstructionPlanStartTime())); @@ -763,12 +782,14 @@ public class DecorationServiceImpl implements DecorationService { //更新装修设计状态 shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110)); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); - //推送给HQT - ConfirmQuotationRequest confirmQuotationRequest = new ConfirmQuotationRequest(); - confirmQuotationRequest.setHqtShopId(shopInfo.getHqtShopId()); - confirmQuotationRequest.setQuotationSheetId(decoration.getQuotationSheetId()); - confirmQuotationRequest.setStatus(CommonConstants.ONE); - hqtAPIService.confirmQuotation(confirmQuotationRequest); + if (StringUtils.isNotBlank(shopInfo.getHqtShopId())) { + //推送给HQT + ConfirmQuotationRequest confirmQuotationRequest = new ConfirmQuotationRequest(); + confirmQuotationRequest.setHqtShopId(shopInfo.getHqtShopId()); + confirmQuotationRequest.setQuotationSheetId(decoration.getQuotationSheetId()); + confirmQuotationRequest.setStatus(CommonConstants.ONE); + hqtAPIService.confirmQuotation(confirmQuotationRequest); + } return Boolean.TRUE; } @@ -821,6 +842,8 @@ public class DecorationServiceImpl implements DecorationService { acceptanceInfoDO.setShopInteriorPhoto(request.getShopInteriorPhoto()); acceptanceInfoDO.setAcceptanceAttachment(request.getAcceptanceAttachment()); acceptanceInfoDO.setBackKitchenPhoto(request.getBackKitchenPhoto()); + acceptanceInfoDO.setDeliveryOrderId(request.getDeliveryOrderId()); + acceptanceInfoDO.setAddReduceAmount(request.getAddReduceAmount()); acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); if (CommonConstants.ONE == request.getOperationsAcceptance().getResult() && CommonConstants.ONE == partner.getResult()) { From 518144c3295781d66b26c963aadf58a5b756c68f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 7 Aug 2025 13:49:49 +0800 Subject: [PATCH 35/38] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E8=A3=85=E4=BF=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopStageInfoMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 9c4988114..5b5b5dde1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -317,6 +317,9 @@ and a.shop_sub_stage = #{shopSubStage} + + and si.hqt_shop_id is not null and si.hqt_shop_id != '' + and a.shop_sub_stage_status in From 31758c4e600fbad0db16e2576ac73402e2f0aefb Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 7 Aug 2025 14:06:39 +0800 Subject: [PATCH 36/38] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E8=A3=85=E4=BF=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopStageInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 5b5b5dde1..afa2a2e80 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -318,7 +318,7 @@ and a.shop_sub_stage = #{shopSubStage} - and si.hqt_shop_id is not null and si.hqt_shop_id != '' + and (si.hqt_shop_id is null or si.hqt_shop_id = '') From 15e8fc097ca0b27aa893dda1c398e88e81b79693 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 7 Aug 2025 17:16:59 +0800 Subject: [PATCH 37/38] fix --- .../com/cool/store/service/impl/DecorationServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 271ffbebc..f87885d2f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -617,9 +617,9 @@ public class DecorationServiceImpl implements DecorationService { } return Boolean.TRUE; } - //更新设计阶段状态=待确认，装修子流程=待进场 + //更新设计阶段状态=待确认， if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_903.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) { - shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_905, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110)); + shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_905)); Map templateParam = new HashMap<>(); templateParam.put("shopName", shopInfo.getShopName()); commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam); @@ -834,6 +834,7 @@ public class DecorationServiceImpl implements DecorationService { request.getOperationsAcceptance().setAcceptanceTime(new Date()); String jsonString = JSONObject.toJSONString(request.getOperationsAcceptance()); AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setId(acceptanceInfoDO1.getId()); acceptanceInfoDO.setShopId(request.getShopId()); acceptanceInfoDO.setOperationsAcceptanceSignatures(jsonString); acceptanceInfoDO.setUpdateTime(new Date()); From aa1e6fdb22c9109f5ec9c13f64583dcb95d4479e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 7 Aug 2025 17:58:44 +0800 Subject: [PATCH 38/38] add log --- .../com/cool/store/service/impl/DataHandlerServerImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java index 5c26489ea..872f9fb52 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java @@ -37,6 +37,7 @@ import java.math.BigDecimal; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.cool.store.utils.poi.DateUtils.SPECIAL_DATE_START_1; import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD; @@ -1264,6 +1265,8 @@ public class DataHandlerServerImpl implements DataHandlerServer { @Override public void dataHandlerPushHqt() { List pushHqtShopList = shopInfoDAO.getPushHqtShopList(); + List shopIds = pushHqtShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); + log.info("推送HQT的店铺shopIds：{}", JSONObject.toJSONString(shopIds)); for (ShopInfoDO shopInfoDO : pushHqtShopList) { try{ hqtAPIService.pushHqtBuild(getHqtBuildRequest(shopInfoDO.getId()));