From b70b490637daef3dd360a417b0b9dca00e7e986b Mon Sep 17 00:00:00 2001 From: bianyadong Date: Sun, 28 Apr 2024 17:43:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/ShopStageAcceptanceRequest.java | 6 ++++++ .../service/OpenAcceptanceInfoService.java | 3 +++ .../impl/OpenAcceptanceInfoServiceImpl.java | 18 ++++++++++++++++++ .../webb/OpenAcceptanceInfoController.java | 10 ++++++++-- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java index 098dd34b8..c993c723d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java @@ -21,4 +21,10 @@ public class ShopStageAcceptanceRequest { @ApiModelProperty("是否合格 0:不合格 1:合格") private Boolean result; + /** + * 店铺id + */ + @ApiModelProperty("店铺id") + private Long shopId; + } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java index 852553918..3d1f77d65 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java @@ -2,6 +2,7 @@ package com.cool.store.service; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest; +import com.cool.store.request.ShopStageAcceptanceRequest; import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.ShopAcceptanceVO; import com.github.pagehelper.PageInfo; @@ -31,4 +32,6 @@ public interface OpenAcceptanceInfoService { * @param shopAcceptanceRequest */ void acceptance(ShopAcceptanceRequest shopAcceptanceRequest, String userId); + + void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java index 405ee1a54..3061ed08c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java @@ -13,6 +13,7 @@ import com.cool.store.enums.point.ShopSubStageFieldEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest; +import com.cool.store.request.ShopStageAcceptanceRequest; import com.cool.store.service.OpenAcceptanceInfoService; import com.cool.store.service.RegionService; import com.cool.store.utils.CoolDateUtils; @@ -141,4 +142,21 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService shopInfoDO.setPlanOpenTime(shopAcceptanceRequest.getPlanOpenTime()); shopInfoDAO.updateShopInfo(shopInfoDO); } + + @Override + public void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest) { + OpenAcceptanceInfoDO openAcceptanceInfoDO = openAcceptanceInfoDAO.selectOne(OpenAcceptanceInfoDO.builder().shopId(shopStageAcceptanceRequest.getShopId()).build()); + if (openAcceptanceInfoDO == null) { + throw new ServiceException("该店铺不存在"); + } + if (openAcceptanceInfoDO.getAcceptanceStatus() != null && openAcceptanceInfoDO.getAcceptanceStatus() == 1) { + throw new ServiceException("该店铺已验收完成，不能再次验收"); + } + + ShopSubStageFieldEnum shopSubStageFieldEnum = ShopSubStageFieldEnum.getByShopSubStage(shopStageAcceptanceRequest.getShopSubStage()); + if (shopSubStageFieldEnum != null) { + ReflectUtil.setFieldValue(openAcceptanceInfoDO, shopSubStageFieldEnum.getFiled(), shopStageAcceptanceRequest.getResult()); + } + openAcceptanceInfoDAO.updateByPrimaryKeySelective(openAcceptanceInfoDO); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java index ebd26a4f6..71f849e45 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java @@ -3,11 +3,11 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest; +import com.cool.store.request.ShopStageAcceptanceRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.OpenAcceptanceInfoService; import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.ShopAcceptanceVO; -import com.cool.store.vo.ShopStageAcceptanceVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; /** * @Author byd @@ -54,4 +53,11 @@ public class OpenAcceptanceInfoController { return ResponseResult.success(Boolean.TRUE); } + @ApiOperation("开业验收-单项") + @PostMapping(path = "/acceptanceOne") + public ResponseResult acceptanceOne(@RequestBody ShopStageAcceptanceRequest shopStageAcceptanceRequest) { + openAcceptanceInfoService.acceptanceOne(shopStageAcceptanceRequest); + return ResponseResult.success(Boolean.TRUE); + } + } From 6cd311bf01e86adcb402c72ac2fbdd237521b756 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 28 Apr 2024 17:52:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?getProjectList=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dto/decoration/ProjectDTO.java | 18 +++++++ .../java/com/cool/store/vo/DesignInfoVo.java | 22 +++++++++ .../com/cool/store/vo/log/DesignLogVo.java | 22 +++++++++ .../service/CoolStoreStartFlowService.java | 14 +----- .../cool/store/service/DecorationService.java | 26 ++++++++++ .../com/cool/store/service/YlfService.java | 7 +++ .../impl/CoolStoreStartFlowServiceImpl.java | 49 +------------------ .../service/impl/DecorationServiceImpl.java | 38 ++++++++++++++ .../impl/OpeningOperationPlanImpl.java | 2 +- .../store/service/impl/YlfServiceImpl.java | 44 ++++++++++++++--- .../webb/PCDecorationController.java | 33 +++++++++++++ 11 files changed, 205 insertions(+), 70 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ProjectDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ProjectDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ProjectDTO.java new file mode 100644 index 000000000..b1f59a3e1 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ProjectDTO.java @@ -0,0 +1,18 @@ +package com.cool.store.dto.decoration; + +import lombok.Data; + +/** + * @Auther: WangShuo + * @Date: 2024/04/28/下午5:37 + * @Version 1.0 + * @注释: + */ +@Data +public class ProjectDTO { + private String projectId; + private String clientCode; + private String clientName; + private String pCode; + private String address; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java new file mode 100644 index 000000000..5ae14ea19 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java @@ -0,0 +1,22 @@ +package com.cool.store.vo; + +import com.cool.store.vo.log.DesignLogVo; +import lombok.Data; + +import java.util.List; + +/** + * @Auther: WangShuo + * @Date: 2024/04/28/下午3:37 + * @Version 1.0 + * @注释:设计阶段信息 + */ +@Data +public class DesignInfoVo { + + private String name; + private Integer resultType; + private String planTime; + private List logs; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java new file mode 100644 index 000000000..1c6d147bc --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java @@ -0,0 +1,22 @@ +package com.cool.store.vo.log; + +import lombok.Data; + +import java.util.List; + +/** + * @Auther: WangShuo + * @Date: 2024/04/28/下午4:02 + * @Version 1.0 + * @注释:设计阶段跟踪日志 + */ +@Data +public class DesignLogVo { + + private String logTime; + private String name; + private String description; + private String planTime; + private String finishTime; + private List attachmentUrl; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java index e55a9058f..c4a6ac110 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java @@ -25,19 +25,7 @@ public interface CoolStoreStartFlowService { * @return */ ResponseResult franchiseAgreement(FranchiseAgreementRequest request,Integer type); - /** - * @Auther: wangshuo - * @Date: 2024/4/25 - * @description:项目列表 - */ - ResponseResult getProjectList(String shopCode); - /** - * @Auther: wangshuo - * @Date: 2024/4/25 - * @description:项目详情 - * @Param projectId:项目主键,clientCode:客户编号,pCode:项目编号 - */ - ResponseResult getStoreDetail(Long projectId,String clientCode,String pCode); + /** * @Auther: wangshuo * @Date: 2024/4/25 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java new file mode 100644 index 000000000..4b1c471a6 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java @@ -0,0 +1,26 @@ +package com.cool.store.service; + +import com.cool.store.vo.DesignInfoVo; + +import java.util.List; + +/** + * @Auther: WangShuo + * @Date: 2024/04/28/下午4:45 + * @Version 1.0 + * @注释: + */ +public interface DecorationService { + /** + * @Auther: wangshuo + * @Date: 2024/4/28 + * @description:获取装修阶段子阶段信息 + */ + List decorations(); + /** + * @Auther: wangshuo + * @Date: 2024/4/28 + * @description:设计阶段信息 + */ + List DesignInfo(String shopCode); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/YlfService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/YlfService.java index 1d93964fe..40709ee53 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/YlfService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/YlfService.java @@ -13,4 +13,11 @@ public interface YlfService { * */ DecorationDTO getDecoration(Long id) ; + /** + * @Auther: wangshuo + * @Date: 2024/4/25 + * @description:项目列表 + */ + String getProjectList(String shopCode); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java index d50f9ea5b..5f5b1647f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java @@ -57,7 +57,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService } } - @Override public ResponseResult franchiseAgreement(FranchiseAgreementRequest request, Integer type) { log.info("newStore param:{}", JSONObject.toJSONString(request)); @@ -81,53 +80,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService } } - @Override - public ResponseResult getProjectList(String shopCode) { - log.info("getProjectList param:{}", shopCode); - if (Objects.isNull(shopCode)) { - throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); - } - String url = String.format(Constants.GET_PROJECT_LIST, shopCode); - log.info("CoolStoreStartFlowServiceImpl#getOrder, url:{}", url); - try { - JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>()); - log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject.toJSONString()); - if (jsonObject.get("status").equals(Constants.SUCCESS)) { - return new ResponseResult(200, jsonObject.get("data").toString(), jsonObject.get("msg").toString()); - } else { - return new ResponseResult(500, jsonObject.get("msg").toString()); - } - } catch (Exception e) { - log.info("调用鲜丰服务异常,getProjectList error:{}", e); - throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR); - } - - } - - @Override - public ResponseResult getStoreDetail(Long projectId, String clientCode, String pCode) { - log.info("getStoreList projectId:{},clientCode:{},pCode:{}", projectId, clientCode, pCode); - if (Objects.isNull(projectId) && Objects.isNull(clientCode) && Objects.isNull(pCode)) { - throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); - } - HashMap requestMap = new HashMap(); - requestMap.put("projectId", projectId); - requestMap.put("clientCode", clientCode); - requestMap.put("pCode", pCode); - try { - JSONObject jsonObject = httpRestTemplateService.getForObject(Constants.GET_PROJECT_DETAIL, JSONObject.class, requestMap); - log.info("FirstOrderServiceImp#getStoreDetail, jsonObject:{}", jsonObject.toJSONString()); - if (jsonObject.get("status").equals(Constants.SUCCESS)) { - return new ResponseResult(200, jsonObject.get("data").toString(), jsonObject.get("msg").toString()); - } else { - return new ResponseResult(500, jsonObject.get("msg").toString()); - } - } catch (Exception e) { - log.info("调用鲜丰服务异常,getProjectList error:{}", e); - throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR); - } - - } @Override public Boolean getFirstOrder(String shopCode) { @@ -156,4 +108,5 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService requestMap.put("timestamp", timestamp); requestMap.put("signature", signature); } + } 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 new file mode 100644 index 000000000..bf02accce --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -0,0 +1,38 @@ +package com.cool.store.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.dto.decoration.DecorationDTO; +import com.cool.store.service.DecorationService; +import com.cool.store.service.YlfService; +import com.cool.store.vo.DesignInfoVo; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + + +/** + * @Auther: WangShuo + * @Date: 2024/04/28/下午4:46 + * @Version 1.0 + * @注释: + */ +@Service +public class DecorationServiceImpl implements DecorationService { + + @Resource + private YlfService ylfService; + @Override + public List decorations() { + return Collections.emptyList(); + } + + @Override + public List DesignInfo(String shopCode) { + String projectId = ylfService.getProjectList(shopCode); + + return Collections.emptyList(); + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 952d625b5..e23c40baf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -198,7 +198,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) { // ShopInfoDO shopInfo = shopService.getShopInfo(shopId); // String shopCode = shopInfo.getShopCode(); - // Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); + //Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); Boolean firstOrder =Boolean.TRUE; log.info("saveOrder,flag:{}", firstOrder); if (firstOrder) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java index ea7fc6d30..bd20b41f2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java @@ -2,10 +2,12 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.dto.decoration.DecorationDTO; +import com.cool.store.dto.decoration.ProjectDTO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.service.YlfService; +import com.cool.store.utils.poi.constant.Constants; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -13,6 +15,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * @Author suzhuhong @@ -23,27 +26,27 @@ import java.util.List; @Slf4j public class YlfServiceImpl implements YlfService { - static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid="; + static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid="; @Resource private HttpRestTemplateService httpRestTemplateService; @Override - public DecorationDTO getDecoration(Long id) { + public DecorationDTO getDecoration(Long id) { String detailUrl = String.format("%s%d", url, id); try { String forObject = httpRestTemplateService.getForObject(detailUrl, String.class, new HashMap<>()); Integer status = (Integer) JSONObject.parseObject(forObject, JSONObject.class).get("status"); - if (status != 200){ - log.info("获取云立方装修公司信息失败,id:{}",id); + if (status != 200) { + log.info("获取云立方装修公司信息失败,id:{}", id); throw new ServiceException(ErrorCodeEnum.YLF_ERROR); } Object data = JSONObject.parseObject(forObject, JSONObject.class).get("data"); - if (data == null){ + if (data == null) { return null; } List list = (List) ((JSONObject) JSONObject.parseObject(forObject, JSONObject.class).get("data")).get("rows"); - if (CollectionUtils.isNotEmpty(list)){ + if (CollectionUtils.isNotEmpty(list)) { return list.get(0); } } catch (Exception e) { @@ -52,11 +55,36 @@ public class YlfServiceImpl implements YlfService { return null; } + @Override + public String getProjectList(String shopCode) { + log.info("getProjectList param:{}", shopCode); + if (Objects.isNull(shopCode)) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + String url = String.format(Constants.GET_PROJECT_LIST, shopCode); + log.info("CoolStoreStartFlowServiceImpl#getOrder, url:{}", url); + try { + String jsonString = httpRestTemplateService.getForObject(url, String.class, new HashMap<>()); + JSONObject jsonObject = JSONObject.parseObject(jsonString); + log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject); + if (jsonObject.get("status").equals(Constants.SUCCESS)) { + if (jsonObject.get("data").toString() == null) { + return null; + } + List projectDTOS = (List) ((JSONObject) JSONObject.parseObject(jsonString, JSONObject.class).get("data")).get("rows"); + return ((ProjectDTO)projectDTOS.get(0)).getProjectId(); + } else { + log.info("获取云立方装修公司信息失败,shopCode:{}", shopCode); + throw new ServiceException(ErrorCodeEnum.YLF_ERROR); + } + } catch (Exception e) { + log.info("调用云立方获取项目列表异常,getProjectList error:{}", e); + throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR); + } - - + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java new file mode 100644 index 000000000..a362ddbd0 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -0,0 +1,33 @@ +package com.cool.store.controller.webb; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.CoolStoreStartFlowService; +import com.cool.store.service.YlfService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @Auther: WangShuo + * @Date: 2024/04/28/下午4:19 + * @Version 1.0 + * @注释: + */ +@RestController +@RequestMapping("/pc/decoration") +@Api(tags = "PC装修阶段") +@Slf4j +public class PCDecorationController { + @Resource + private YlfService ylfService; + @GetMapping("/get") + private ResponseResult get(){ + String shopCode = "31310383"; + return new ResponseResult<>(200,ylfService.getProjectList(shopCode)) ; + + } +} From 71a68b3a59cd6d96143213118a3bee4946ea86c4 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Sun, 28 Apr 2024 17:55:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/MessageEnum.java | 7 +++++++ .../java/com/cool/store/enums/SMSMsgEnum.java | 1 + .../cool/store/entity/PointAuditRecordDO.java | 3 --- .../cool/store/entity/PointDetailInfoDO.java | 20 +++++++++++++++++++ .../store/service/impl/CommonService.java | 8 +++++--- .../impl/LineInterviewServiceImpl.java | 4 +++- .../store/service/impl/PointServiceImpl.java | 7 ++++++- .../controller/webb/PCTestController.java | 2 +- .../controller/webb/PointController.java | 1 - 9 files changed, 43 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 023746002..ad157e545 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -10,6 +10,13 @@ public enum MessageEnum { MESSAGE_1("您有一份加盟意向申请，请查收。", "##### 加盟商姓名：{0}\n##### 意向加盟区域：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), MESSAGE_2("您有一份邀约面谈预约，请查收。", "##### 加盟商姓名：{0}\n##### 意向加盟区域：{1}\n##### 预约面谈时间：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_3("您收到一份邀约面谈预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_4("您收到一份一次面审预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_5("您收到一份二次面审预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_6("您有线索未通过面审，请查收", "##### 加盟商姓名：{0}\n##### 面审时间：{1}\n##### 面审官：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_7("您的铺位已审核通过，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_8("您有一个铺位需要审核，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), + MESSAGE_9("已为您分配一位加盟商，请查收", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n##### 意向加盟区域：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"), ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java index 0fc308074..a36f0774e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java @@ -8,6 +8,7 @@ package com.cool.store.enums; public enum SMSMsgEnum { MODIFY_INTERVIEW_TIME("修改面审时间","", "SMS_464760909"), + SECOND_INTERVIEW_PASS("二审面试通过","", "SMS_464760909"), ; private String title; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java index 3377f9226..47ee4c0d6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java @@ -1,11 +1,8 @@ package com.cool.store.entity; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.cool.store.dto.point.AuditNodeDTO; import com.cool.store.enums.AuditStatusEnum; import com.cool.store.enums.NodeNoEnum; -import com.cool.store.request.PointAuditRequest; import lombok.Data; import java.util.ArrayList; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java index 8c566c60a..d36da08ed 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java @@ -1,8 +1,11 @@ package com.cool.store.entity; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.cool.store.enums.point.*; import lombok.Data; import org.apache.commons.lang3.StringUtils; +import sun.plugin.javascript.JSClassLoader; import java.util.Date; import java.util.Objects; @@ -589,6 +592,23 @@ public class PointDetailInfoDO { if(Objects.isNull(this.pictureObj) || StringUtils.isBlank(this.pictureObj)){ return false; } + JSONObject jsonObject = JSONObject.parseObject(this.pictureObj); + JSONArray front = jsonObject.getJSONArray("front"); + if(Objects.isNull(front) || front.isEmpty()){ + return false; + } + JSONArray leftSide = jsonObject.getJSONArray("leftSide"); + if(Objects.isNull(leftSide) || leftSide.isEmpty()){ + return false; + } + JSONArray rightSide = jsonObject.getJSONArray("rightSide"); + if(Objects.isNull(rightSide) || rightSide.isEmpty()){ + return false; + } + JSONArray video = jsonObject.getJSONArray("video"); + if(Objects.isNull(video) || video.isEmpty()){ + return false; + } return true; } } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index df4a50a9e..5df4a2c57 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -75,7 +75,7 @@ public class CommonService { return (AuditResultService) applicationContext.getBean(auditEnum.getClazz()); } - public void sendMessage(List userIds, Long lineId, MessageEnum message, String... param){ + public void sendMessage(List userIds, MessageEnum message, String... param){ if(CollectionUtils.isEmpty(userIds)){ return; } @@ -83,7 +83,7 @@ public class CommonService { if(CollectionUtils.isEmpty(userIds)){ return; } - String mobileParam = MessageFormat.format("{0}&eid={1}&corpId={2}&appType=dingding2&lineId={3}", "", enterpriseId, dingCorpId, String.valueOf(lineId)); + String mobileParam = MessageFormat.format("{0}&eid={1}&corpId={2}&appType=dingding2&lineId={3}", "", enterpriseId, dingCorpId, null); try { String messageUrl = coolStoreDomainUrl + "dd-noticemsg?miniAppId={0}&appId={1}&corpId={2}&appUrl=" + URLEncoder.encode("pages/common-web-view/index?routerUrl=notice&target=" + mobileParam, StandardCharsets.UTF_8.name()); SendMessageDTO messageDTO = new SendMessageDTO(); @@ -131,8 +131,10 @@ public class CommonService { .phoneNumberJson(JSONObject.toJSONString(poneNumbers)) .signNameJson(JSONObject.toJSONString(Arrays.asList(signName))) .templateCode(templateCode.getTemplateCode()) - .templateParamJson(templateParam.toJSONString()) .build(); + if(Objects.nonNull(templateParam)){ + sendBatchSmsRequest.toBuilder().templateParamJson(templateParam.toJSONString()); + } CompletableFuture response = client.sendBatchSms(sendBatchSmsRequest); SendBatchSmsResponse resp = response.get(); log.info("短信发送response:{}", JSONObject.toJSONString(resp)); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index b7181808e..63aab0222 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -156,7 +156,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt } LineInterviewDO addInterview = LineInterviewDO.convertDO(lineInfo, startTime, endTime, UUIDUtils.get8UUID(), interviewerUserId, interviewType.getCode(), eventId); lineInterviewDAO.addInterviewInfo(addInterview); - commonService.sendMessage(Arrays.asList(interviewerUserId), lineInfo.getId(), MessageEnum.MESSAGE_2, lineInfo.getUsername(), hyOpenAreaInfoDAO.selectNameMapById(lineInfo.getWantShopAreaId()), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, startTime)); + commonService.sendMessage(Arrays.asList(interviewerUserId), MessageEnum.MESSAGE_2, lineInfo.getUsername(), hyOpenAreaInfoDAO.selectNameMapById(lineInfo.getWantShopAreaId()), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, startTime)); return Boolean.TRUE; } @@ -428,6 +428,8 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt shopService.initShop(lineInfo); //二审稽核 auditStatusService.insert(lineInfo.getId(),interviewInfo.getId(),auditId,AuditStageEnum.TWO.getCode()); + //发送短信 + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SECOND_INTERVIEW_PASS, null); } return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index d96422d1d..9aac49f5d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -81,6 +81,8 @@ public class PointServiceImpl implements PointService { private ShopAuditInfoDAO shopAuditInfoDAO; @Resource private SysRoleService sysRoleService; + @Resource + private CommonService commonService; @Value("${mybatis.configuration.variables.enterpriseId}") private String enterpriseId; @@ -351,6 +353,7 @@ public class PointServiceImpl implements PointService { if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20)); } + commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_7, pointInfo.getPointName(), pointInfo.getAddress()); } return pointInfoDAO.updatePointInfo(updatePoint); } @@ -400,6 +403,8 @@ public class PointServiceImpl implements PointService { if(Objects.nonNull(nextAuditRecord)){ //更新下一阶段任务的收到任务时间 pointAuditRecordDAO.updatePointAuditRecord(PointAuditRecordDO.convert(nextAuditRecord.getId(), new Date())); + List sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class); + commonService.sendMessage(sendMessageUserIds, MessageEnum.MESSAGE_8, pointInfo.getPointName(), pointInfo.getAddress()); //审批通过的情况下 生成下一个节点的待办数据 return pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord)); } @@ -408,8 +413,8 @@ public class PointServiceImpl implements PointService { pointInfoUpdate.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20)); - } + commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_7, pointInfo.getPointName(), pointInfo.getAddress()); return pointInfoDAO.updatePointInfo(pointInfoUpdate); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index d306376ff..34a94abf0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -35,7 +35,7 @@ public class PCTestController { @GetMapping("/sendMessage") public ResponseResult sendMessage(){ - commonService.sendMessage(Arrays.asList("123836131931284423"), 1L, MessageEnum.MESSAGE_1, "张三", "浙江-杭州"); + commonService.sendMessage(Arrays.asList("123836131931284423"), MessageEnum.MESSAGE_1, "张三", "浙江-杭州"); return ResponseResult.success(Boolean.FALSE); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java index 4a9790e4b..a3edca821 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java @@ -2,7 +2,6 @@ package com.cool.store.controller.webb; import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.PartnerUserHolder; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; import com.cool.store.service.PointService; From 4b00acf753ed6430da1bdbe40f4937d01eb99220 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Sun, 28 Apr 2024 17:56:29 +0800 Subject: [PATCH 4/4] fix --- .../src/main/java/com/cool/store/entity/PointDetailInfoDO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java index d36da08ed..f91a26940 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.enums.point.*; import lombok.Data; import org.apache.commons.lang3.StringUtils; -import sun.plugin.javascript.JSClassLoader; import java.util.Date; import java.util.Objects;