From 529e41a0af8c0ac9e6faacbe377c6ec5a71ec61b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 16 Jun 2025 15:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E8=AE=A1=E5=B8=88?= =?UTF-8?q?=E5=92=8C=E8=AE=BE=E8=AE=A1=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 3 +- .../com/cool/store/enums/MessageEnum.java | 1 + .../store/dao/DecorationDesignInfoDAO.java | 35 ++++++++---- .../mapper/DecorationDesignInfoMapper.java | 7 +++ .../mapper/DecorationDesignInfoMapper.xml | 11 ++++ .../cool/store/service/DecorationService.java | 4 ++ .../impl/DecorationMeasureServiceImpl.java | 2 +- .../service/impl/DecorationServiceImpl.java | 53 ++++++++++++++++++- .../webb/PCDecorationController.java | 14 +++++ 9 files changed, 116 insertions(+), 14 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 3e1d5a217..7f25c923e 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 @@ -243,7 +243,8 @@ public enum ErrorCodeEnum { QUOTATION_URL_REQUIRED(131010,"请等待报价单提交",null), DESIGN_URL_REQUIRED(131011,"请等待设计图提交",null), LEGAL_PERSON_NAME_NOT_SAME(131012,"法人姓名与加盟商姓名不一致",null), - + UPDATE_DESIGN_LEADER(131019,"设计阶段状态不支持修改设计组",null), + UPDATE_DESIGN_USER(131022,"设计阶段状态不支持修改设计师",null), TALLY_BOOK_NOT_EXIST(180001, "记账本数据不存在", null), THIRD_API_ERROR(151001,"第三方服务异常->{0}",null), 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 73cc708e8..ec011a3c1 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 @@ -88,6 +88,7 @@ public enum MessageEnum { MESSAGE_59("您有一个门店设计阶段报价任务待领取，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_60("您有一个门店已提交京东建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_61("您有一个门店京东外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_62("您有一个门店设计阶段设计图待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java index 46eb2bc58..cb65f938a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java @@ -24,14 +24,15 @@ public class DecorationDesignInfoDAO { @Resource DecorationDesignInfoMapper decorationDesignInfoMapper; - public DecorationDesignInfoDO getById(Long id){ - if(id == null){ + public DecorationDesignInfoDO getById(Long id) { + if (id == null) { return null; } return decorationDesignInfoMapper.selectByPrimaryKey(id); } - public List getByIds(List shopIds){ - if(CollectionUtils.isEmpty(shopIds)){ + + public List getByIds(List shopIds) { + if (CollectionUtils.isEmpty(shopIds)) { return new ArrayList<>(); } Example example = new Example(DecorationDesignInfoDO.class); @@ -39,29 +40,41 @@ public class DecorationDesignInfoDAO { return decorationDesignInfoMapper.selectByExample(example); } - public Integer insertSelective(DecorationDesignInfoDO decorationDesignInfoDO){ + public Integer insertSelective(DecorationDesignInfoDO decorationDesignInfoDO) { return decorationDesignInfoMapper.insertSelective(decorationDesignInfoDO); } - public Integer updateByPrimaryKeySelective(DecorationDesignInfoDO decorationDesignInfoDO){ + public Integer updateByPrimaryKeySelective(DecorationDesignInfoDO decorationDesignInfoDO) { return decorationDesignInfoMapper.updateByPrimaryKeySelective(decorationDesignInfoDO); } - public DecorationDesignInfoDO getByShopId(Long shopId){ - if(shopId == null){ + public DecorationDesignInfoDO getByShopId(Long shopId) { + if (shopId == null) { return null; } return decorationDesignInfoMapper.selectByShopId(shopId); } // 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 - public List getByDesignUserIdAndShopStage(String userId, String keyword){ - if(userId == null){ + public List getByDesignUserIdAndShopStage(String userId, String keyword) { + if (userId == null) { return new ArrayList<>(); } - return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); + return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); } + public Integer updateDesignLeaderIdAndDesignUserIdInteger(Long shopId, String designLeaderId) { + if (shopId == null|| StringUtil.isEmpty(designLeaderId)){ + return 0; + } + return decorationDesignInfoMapper.updateDesignLeaderIdAndDesignUserIdInteger(shopId, designLeaderId); + } + public Integer updateDesignUserId(Long shopId, String designUserId) { + if (shopId == null|| StringUtil.isEmpty(designUserId)){ + return 0; + } + return decorationDesignInfoMapper.updateDesignUserId(shopId, designUserId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java index 604e913e4..5c143728b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java @@ -18,5 +18,12 @@ public interface DecorationDesignInfoMapper extends Mapper getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); + /** + * @Auther: wangshuo + * @Date: 2025/6/16 + * @description:DesignUserId置空 + */ + Integer updateDesignLeaderIdAndDesignUserIdInteger(@Param("shopId") Long shopId,@Param("designLeaderId") String designLeaderId); + Integer updateDesignUserId(@Param("shopId") Long shopId,@Param("designUserId") String designUserId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index 2141ae8c4..71bff903a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -27,6 +27,17 @@ + + update xfsg_decoration_design_info + set design_leader_id = #{designLeaderId}, + design_user_id = null + where shop_id = #{shopId} + + + update xfsg_decoration_design_info + set design_user_id = #{designUserId} + where shop_id = #{shopId} +