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()) {