From 7e072c9af21c900ae9a12c709ce86006cf91b53a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 30 Apr 2024 00:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/CommonConstants.java | 40 +++-- .../com/cool/store/dao/AcceptanceInfoDAO.java | 45 ++++++ .../com/cool/store/dao/AssessmentDataDAO.java | 38 +++++ .../store/mapper/AcceptanceInfoMapper.java | 17 ++ .../store/mapper/AssessmentDataMapper.java | 5 + .../com/cool/store/mapper/ShopInfoMapper.java | 6 - .../resources/mapper/AcceptanceInfoMapper.xml | 58 +++++++ .../resources/mapper/AssessmentDataMapper.xml | 27 ++++ .../main/resources/mapper/ShopInfoMapper.xml | 7 +- .../dto/openPreparation/FirstOrderDTO.java | 6 +- .../store/request/LinePaySubmitRequest.java | 2 +- .../store/request/ThreeAcceptanceRequest.java | 21 +++ .../response/ThreeAcceptanceResponse.java | 31 ++++ .../com/cool/store/vo/DecorationModelVO.java | 38 +++++ .../java/com/cool/store/vo/DesignInfoVo.java | 2 +- .../cool/store/vo/OpeningOperationPlanVO.java | 2 + .../com/cool/store/vo/log/DesignLogVo.java | 20 --- .../store/service/AssessmentDataService.java | 18 +++ .../cool/store/service/DecorationService.java | 38 ++++- .../com/cool/store/service/YlfService.java | 2 +- .../impl/AssessmentDataServiceImpl.java | 30 ++++ .../service/impl/DecorationServiceImpl.java | 153 ++++++++++++++---- .../service/impl/FirstOrderServiceImp.java | 2 +- .../impl/OpeningOperationPlanImpl.java | 3 + .../service/impl/PreparationServiceImpl.java | 69 ++++---- .../store/service/impl/YlfServiceImpl.java | 10 +- .../webb/PCDecorationController.java | 18 +++ .../webc/MiniDecorationController.java | 25 ++- .../webc/MiniOpenPreparationController.java | 4 +- .../com/cool/store/job/XxlJobHandler.java | 111 +++++++++++-- 30 files changed, 721 insertions(+), 127 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/response/ThreeAcceptanceResponse.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/DecorationModelVO.java delete 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/AssessmentDataService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentDataServiceImpl.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 4a91c2a81..3d6ef94e0 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -20,7 +20,7 @@ public class CommonConstants { public static final int ACCESS_TOKEN_EXPIRE = 14400; - public static final int THREE_DAY_SECONDS = 60*60*24*3; + public static final int THREE_DAY_SECONDS = 60 * 60 * 24 * 3; public static final int NORMAL_LOCK_TIMES = 60 * 1000; @@ -108,8 +108,8 @@ public class CommonConstants { public static final int ONE_THOUSAND = 1000; public static final int FIFTY_FIVE = 55; public static final int SIXTY_FIVE = 65; - public static final int MIN_CODE = 10000000; - public static final int MAX_CODE = 89999999; + public static final int MIN_CODE = 10000000; + public static final int MAX_CODE = 89999999; public static final String ONE_STR = "1"; @@ -123,23 +123,22 @@ public class CommonConstants { public static final String NINE_STR = "9"; public static final String TEN_STR = "10"; - public static final String FOLLOW = "follow"; - public static final String PENDING = "pending"; + public static final String FOLLOW = "follow"; + public static final String PENDING = "pending"; - public static final String CLOSE = "close"; - public static final String OPEN = "open"; + public static final String CLOSE = "close"; + public static final String OPEN = "open"; + public static final String ALLOCATION = "allocation"; - public static final String ALLOCATION = "allocation"; - - public static final String TRANSFER = "transfer"; + public static final String TRANSFER = "transfer"; // 短信模版-意向申请审批通过 - public static final String SMS_TEMPLATE_CODE_INTENT = "SMS_461990823"; + public static final String SMS_TEMPLATE_CODE_INTENT = "SMS_461990823"; // 短信模版-资质审核通过 - public static final String SMS_TEMPLATE_CODE_VERIFY = "SMS_461980876"; + public static final String SMS_TEMPLATE_CODE_VERIFY = "SMS_461980876"; public static final String DAY_END_TIME_SUFFIX = " 23:59:59"; @@ -157,4 +156,21 @@ public class CommonConstants { public static final int MAX_LENGTH_ONE_HUNDRED = 100; public static final String YUN_XUE_TANG_SUC_CODE = "10000"; + //鲜丰 + //设计阶段+施工阶段 + public static final String CONSTRUCTION_PHASE = "施工阶段"; + public static final String MEASURING_THE_ROOM = "量房"; + public static final String CONSTRUCTION_DRAWING = "施工图+预算"; + public static final String FLOOR_PLAN = "平面图+门头效果图"; + public static final String APPROACH="进场"; + public static final String ONE_DAY="第一天-进场拆除、基础材料下单、物料设备下单"; + public static final String TWO_DAY="第二天-水电预埋、地砖铺贴"; + public static final String THREE_DAY="第三天-橱窗隔断、木工包柱、电工布线"; + public static final String FOUR_DAY="第四天-护墙板安装、空调安装"; + public static final String FIVE_DAY="第五天-吊顶隔断、木工铝塑板"; + public static final String SIX_DAY="第六天-灯具安装、室内广告安装、冷柜安装、道具卸货"; + public static final String SEVEN_DAY="第七天-道具安装、室外招牌安装"; + public static final String EIGHT_DAY="第八天-卫生保洁、网络及收银设备安装、撤场交接"; + public static final String WITHDRAWAL="撤场"; + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java new file mode 100644 index 000000000..951ee9ac3 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java @@ -0,0 +1,45 @@ +package com.cool.store.dao; + +import com.cool.store.entity.AcceptanceInfoDO; +import com.cool.store.mapper.AcceptanceInfoMapper; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Objects; + +/** + * @Auther: WangShuo + * @Date: 2024/04/29/下午7:47 + * @Version 1.0 + * @注释: + */ +@Repository +public class AcceptanceInfoDAO { + @Resource + private AcceptanceInfoMapper acceptanceInfoMapper; + + public Long insertAcceptanceInfo(AcceptanceInfoDO acceptanceInfoDO){ + if (Objects.isNull(acceptanceInfoDO)){ + return null; + } + acceptanceInfoMapper.insert(acceptanceInfoDO); + return acceptanceInfoDO.getId(); + } + public List selectAcceptanceInfo(){ + return acceptanceInfoMapper.selectShopIdListBySignatures(); + } + public Integer updateAcceptanceInfo(AcceptanceInfoDO acceptanceInfoDO){ + if (Objects.isNull(acceptanceInfoDO)){ + return 0; + } + return acceptanceInfoMapper.updateByShopIDSelective(acceptanceInfoDO); + } + public AcceptanceInfoDO selectByShopId (Long shopId){ + if (Objects.isNull(shopId)){ + return null; + } + return acceptanceInfoMapper.selectByShopId(shopId); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java new file mode 100644 index 000000000..580fcdf48 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java @@ -0,0 +1,38 @@ +package com.cool.store.dao; + +import com.cool.store.entity.AssessmentDataDO; +import com.cool.store.mapper.AssessmentDataMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Auther: WangShuo + * @Date: 2024/04/29/下午10:38 + * @Version 1.0 + * @注释: AssessmentDataDO + */ +@Repository +public class AssessmentDataDAO { + @Resource + private AssessmentDataMapper assessmentDataMapper; + public Boolean batchInsert(List assessmentDataDOS) { + if (CollectionUtils.isEmpty(assessmentDataDOS) && assessmentDataDOS.size() > 0) { + for (AssessmentDataDO assessmentDataDO : assessmentDataDOS) { + assessmentDataMapper.insert(assessmentDataDO); + } + return Boolean.TRUE; + } + return Boolean.FALSE; + } + public Integer batchUpdate(List assessmentDataDOS) { + if (CollectionUtils.isEmpty(assessmentDataDOS) && assessmentDataDOS.size() > 0) { + + return assessmentDataMapper.batchUpdate(assessmentDataDOS); + } + return 0; + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java index be82407f0..8f58e8a4d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java @@ -1,7 +1,24 @@ package com.cool.store.mapper; import com.cool.store.entity.AcceptanceInfoDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface AcceptanceInfoMapper extends Mapper { + /** + * @Auther: wangshuo + * @Date: 2024/4/29 + * @description:根据shopid查询 + */ + List selectShopIdListBySignatures(); + /** + * @Auther: wangshuo + * @Date: 2024/4/29 + * @description:根据shopID修改 + */ + Integer updateByShopIDSelective(AcceptanceInfoDO acceptanceInfoDO); + + AcceptanceInfoDO selectByShopId(@Param("shopId") Long shopId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java index 879375cac..b561316ad 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java @@ -1,7 +1,12 @@ package com.cool.store.mapper; import com.cool.store.entity.AssessmentDataDO; +import com.cool.store.entity.ShopStageInfoDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface AssessmentDataMapper extends Mapper { + Integer batchUpdate( List AssessmentDataDOS); } \ No newline at end of file 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 5005aad20..e60b50d83 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 @@ -68,12 +68,6 @@ public interface ShopInfoMapper extends Mapper { */ List getShopListByIds(@Param("shopIds")List shopIds); - /** - * @Auther: wangshuo - * @Date: 2024/4/25 - * @description:获取筹建阶段shopid - */ - List queryShopIdListByStage(); /** * @Auther: wangshuo * @Date: 2024/4/25 diff --git a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml index ac70b9c2a..7377da572 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml @@ -20,4 +20,62 @@ + + id,shop_id,actual_entry_time,planned_completion_time,planned_start_time,decoration_planned_completion_time, + decoration_planned_start_time,construction_completion_time,engineering_acceptance_signatures, + operations_acceptance_signatures,partner_acceptance_signatures, + create_time,update_time,deleted + + + update xfsg_acceptance_info + + + actual_entry_time = #{actualEntryTime} , + + + planned_completion_time = #{plannedCompletionTime} , + + + planned_start_time = #{plannedStartTime} , + + + decoration_planned_completion_time = #{decorationPlannedCompletionTime} , + + + decoration_planned_start_time = #{decorationPlannedStartTime} , + + + construction_completion_time = #{constructionCompletionTime} , + + + engineering_acceptance_signatures = #{engineeringAcceptanceSignatures} , + + + operations_acceptance_signatures = #{operationsAcceptanceSignatures} , + + + partner_acceptance_signatures = #{partnerAcceptanceSignatures} , + + + update_time = #{updateTime} , + + + deleted = #{deleted} , + + + where shop_id = #{shopId} + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml index 1eb43e09d..f7a342bf0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml @@ -14,4 +14,31 @@ + + update xfsg_assessment_data + + qualified = CASE id + + WHEN #{item.id} THEN #{item.qualified} + , + score = CASE id + + WHEN #{item.id} THEN #{item.score} + , + reason = CASE id + + WHEN #{item.id} THEN #{item.reason} + , + comments = CASE id + + WHEN #{item.id} THEN #{item.comments} + + END + + where id in ( + + #{item.id} + + ) + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index aaeea2b7d..6c23c78ef 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -73,12 +73,7 @@ - +