Merge branch 'refs/heads/master' into cc_20251112_wallet

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java

@@ -8,6 +8,7 @@ import com.aliyun.openservices.ons.api.bean.Subscription;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.enums.RocketMqGroupEnum;
 import com.cool.store.mq.RocketMqConfig;
+import com.cool.store.mq.consumer.listener.ShopDecorationAssignListener;
 import com.cool.store.mq.consumer.listener.StoreUserUpdateListener;
 import com.cool.store.mq.consumer.listener.XfsgTrainingPersonSyncListener;
 import com.google.common.collect.Maps;
@@ -35,6 +36,8 @@ public class ConsumerClient {
     private XfsgTrainingPersonSyncListener xfsgTrainingPersonSyncListener;
     @Resource
     private StoreUserUpdateListener storeUserUpdateListener;
+    @Resource
+    private ShopDecorationAssignListener shopDecorationAssignListener;
 
     /**
      * 获取通用配置
@@ -101,4 +104,17 @@ public class ConsumerClient {
         return consumerBean;
     }
 
+    @Bean(initMethod = "start", destroyMethod = "shutdown")
+    public ConsumerBean shopDecorationAssign() {
+        RocketMqGroupEnum groupEnum = RocketMqGroupEnum.SHOP_DECORATION_ASSIGN;
+        ConsumerBean consumerBean = new ConsumerBean();
+        //配置文件
+        Properties properties = getCommonProperties(groupEnum);
+        consumerBean.setProperties(properties);
+        Map<Subscription, MessageListener> commonSubscriptionTable = getCommonSubscriptionTable(groupEnum, shopDecorationAssignListener);
+        //订阅多个topic如上面设置
+        consumerBean.setSubscriptionTable(commonSubscriptionTable);
+        return consumerBean;
+    }
+
 }

coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/ShopDecorationAssignListener.java

@@ -0,0 +1,65 @@
+package com.cool.store.mq.consumer.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.openservices.ons.api.Action;
+import com.aliyun.openservices.ons.api.ConsumeContext;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.MessageListener;
+import com.cool.store.constants.CommonConstants;
+import com.cool.store.dao.decoration.ShopDecorationAssignDAO;
+import com.cool.store.dto.store.StoreUserPositionDTO;
+import com.cool.store.dto.store.StoreUserUpdateDTO;
+import com.cool.store.entity.decoration.ShopDecorationAssignDO;
+import com.cool.store.service.DecorationHandleService;
+import com.cool.store.utils.RedisUtilPool;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 10:13
+ * @Version 1.0
+ */
+@Slf4j
+@Service
+public class ShopDecorationAssignListener implements MessageListener {
+
+    @Autowired
+    public RedisUtilPool redisUtilPool;
+    @Resource
+    DecorationHandleService decorationHandleService;
+    @Resource
+    ShopDecorationAssignDAO shopDecorationAssignDAO;
+
+    @Override
+    public Action consume(Message message, ConsumeContext context) {
+        String text = new String(message.getBody());
+        if(StringUtils.isBlank(text)){
+            log.info("消息体为空,tag:{},messageId:{}",message.getTag(),message.getMsgID());
+            return Action.CommitMessage;
+        }
+        String lockKey = "ShopDecorationAssignListener:" + message.getMsgID();
+        boolean lock = redisUtilPool.setNxExpire(lockKey, message.getMsgID(), CommonConstants.NORMAL_LOCK_TIMES);
+        if(lock){
+            try {
+                ShopDecorationAssignDO shopDecorationAssignDO = shopDecorationAssignDAO.getById(Long.valueOf(text));
+                decorationHandleService.handleDecorationTeam(shopDecorationAssignDO);
+            }catch (Exception e){
+                log.error("ShopDecorationAssignListener consume error",e);
+                return Action.ReconsumeLater;
+            }finally {
+                redisUtilPool.delKey(lockKey);
+            }
+            log.info("消费成功,tag:{},messageId:{},reqBody={}",message.getTag(),message.getMsgID(),text);
+            return Action.CommitMessage;
+        }
+        return Action.ReconsumeLater;
+    }
+}

coolstore-partner-service/src/main/java/com/cool/store/service/DecorationHandleService.java

@@ -0,0 +1,94 @@
+package com.cool.store.service;
+
+import com.cool.store.common.PageBasicInfo;
+import com.cool.store.dto.ShopSignerInfoDTO;
+import com.cool.store.dto.decoration.DecorationListDTO;
+import com.cool.store.dto.decoration.DecorationTeamDTO;
+import com.cool.store.entity.decoration.ShopDecorationAssignDO;
+import com.cool.store.request.decoration.AddTeamRequest;
+import com.cool.store.request.decoration.DecorationListRequest;
+import com.cool.store.request.decoration.UpdateConstructionTeamRequest;
+import com.cool.store.request.decoration.UpdateTeamRequest;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/29 15:54
+ * @Version 1.0
+ */
+public interface DecorationHandleService {
+
+
+    /**
+     * 新增团队
+     * @param request
+     * @return
+     */
+    Boolean addTeam(AddTeamRequest request);
+
+    /**
+     * 修改团队
+     * @param request
+     * @return
+     */
+    Boolean update(UpdateTeamRequest request);
+
+    /**
+     * 删除团队
+     * @param teamId
+     * @return
+     */
+    Boolean deleteByTeamId(Long teamId);
+
+    /**
+     * pageBasicInfo
+     * 根据条件查询团队
+     * @return
+     */
+    PageInfo<DecorationTeamDTO> listByCondition(PageBasicInfo pageBasicInfo );
+
+    /**
+     * openCityId
+     * @param openCityId
+     * @return
+     */
+    Long getDecorationTeamIdByCityId(Long openCityId);
+
+    /**
+     * 处理团队
+     * @param teamId
+     * @return
+     */
+    Boolean handleDecorationTeam(ShopDecorationAssignDO shopDecorationAssignDO);
+
+    /**
+     * 列表
+     * @param request
+     * @return
+     */
+    PageInfo<DecorationListDTO> getDecorationAssignList(DecorationListRequest request);
+
+    /**
+     * 获取门店签约信息
+     * @param shopId
+     * @return
+     */
+    ShopSignerInfoDTO getShopSignerInfo(Long shopId);
+
+    /**
+     * 更新施工团队
+     * @param request
+     * @return
+     */
+    Boolean updateConstructionTeam(UpdateConstructionTeamRequest request);
+
+
+
+
+
+
+
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java

@@ -4,6 +4,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.request.AddSignFranchiseRequest;
 import com.cool.store.request.AuditApproveRequest;
 import com.cool.store.request.AuditResultRequest;
+import com.cool.store.request.HqtBuildRequest;
 import com.cool.store.response.AddSignFranchiseResponse;
 import com.cool.store.response.ResponseResult;
 
@@ -42,4 +43,6 @@ public interface SignFranchiseService {
     Boolean rePay(Long shopId);
 
     Integer dateHandle();
+
+     HqtBuildRequest getHqtBuildRequest(Long shopId);
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java

@@ -0,0 +1,251 @@
+package com.cool.store.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.common.PageBasicInfo;
+import com.cool.store.dao.*;
+import com.cool.store.dao.decoration.DecorationTeamConfigDAO;
+import com.cool.store.dao.decoration.ShopDecorationAssignDAO;
+import com.cool.store.dao.decoration.TeamAreaMappingDAO;
+import com.cool.store.dto.ShopSignerInfoDTO;
+import com.cool.store.dto.decoration.DecorationListDTO;
+import com.cool.store.dto.decoration.DecorationTeamDTO;
+import com.cool.store.dto.decoration.TeamAreaMappingDTO;
+import com.cool.store.entity.*;
+import com.cool.store.entity.decoration.DecorationTeamConfigDO;
+import com.cool.store.entity.decoration.ShopDecorationAssignDO;
+import com.cool.store.entity.decoration.TeamAreaMappingDO;
+import com.cool.store.enums.Decoration.DecorationDescStatus;
+import com.cool.store.enums.Decoration.DecorationUseSystemEnum;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.JoinModeEnum;
+import com.cool.store.enums.point.ShopSubStageStatusEnum;
+import com.cool.store.exception.ServiceException;
+import com.cool.store.request.decoration.AddTeamRequest;
+import com.cool.store.request.decoration.DecorationListRequest;
+import com.cool.store.request.decoration.UpdateConstructionTeamRequest;
+import com.cool.store.request.decoration.UpdateTeamRequest;
+import com.cool.store.service.DecorationHandleService;
+import com.cool.store.service.HqtAPIService;
+import com.cool.store.service.SignFranchiseService;
+import com.cool.store.utils.RedisUtilPool;
+import com.cool.store.utils.StringUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import springfox.documentation.service.ApiListing;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/29 15:55
+ * @Version 1.0
+ */
+@Service
+@Slf4j
+public class DecorationHandleServiceImpl implements DecorationHandleService {
+
+
+    @Resource
+    private DecorationTeamConfigDAO decorationTeamConfigDAO;
+    @Resource
+    private TeamAreaMappingDAO teamAreaMappingDAO;
+    @Resource
+    ShopDecorationAssignDAO shopDecorationAssignDAO;
+    @Resource
+    RedisUtilPool redisUtilPool;
+    @Resource
+    private HqtAPIService hqtAPIService;
+    @Resource
+    ShopStageInfoDAO shopStageInfoDAO;
+    @Resource
+    ShopInfoDAO shopInfoDAO;
+    @Resource
+    SignFranchiseService signFranchiseService;
+    @Resource
+    RegionDao regionDao;
+    @Resource
+    LineInfoDAO lineInfoDAO;
+    @Resource
+    private SignFranchiseDAO signFranchiseDAO;
+
+    @Override
+    public Boolean addTeam(AddTeamRequest request) {
+        //校验
+        if (Objects.isNull(request)||CollectionUtils.isEmpty(request.getOpenCityIdList()) || StringUtil.isEmpty(request.getTeamName())){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
+        }
+        //先删除城市团队关系
+        teamAreaMappingDAO.deletedIds(request.getOpenCityIdList());
+
+        DecorationTeamConfigDO decorationTeamConfigDO = new DecorationTeamConfigDO();
+        decorationTeamConfigDO.setTeamName(request.getTeamName());
+        decorationTeamConfigDO.setTeamCode(getNextNumber());
+        decorationTeamConfigDO.setUseSystem(request.getUserSystem());
+        decorationTeamConfigDAO.addTeam(decorationTeamConfigDO);
+        teamAreaMappingDAO.batchInsert(decorationTeamConfigDO.getId(),request.getOpenCityIdList());
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public Boolean update(UpdateTeamRequest request) {
+        if (request.getId() == null||CollectionUtils.isEmpty(request.getOpenCityIdList()) || StringUtil.isEmpty(request.getTeamName())){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
+        }
+        DecorationTeamConfigDO teamConfigDO = decorationTeamConfigDAO.getById(request.getId());
+        if (teamConfigDO==null){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+        }
+        teamConfigDO.setTeamName(request.getTeamName());
+        teamConfigDO.setUseSystem(request.getUserSystem());
+        decorationTeamConfigDAO.updateTeam(teamConfigDO);
+        //删除团队城市关系
+        teamAreaMappingDAO.deletedByTeamId(teamConfigDO.getId());
+        //新增更新之后的团队城市关系
+        teamAreaMappingDAO.batchInsert(teamConfigDO.getId(),request.getOpenCityIdList());
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public Boolean deleteByTeamId(Long teamId) {
+        DecorationTeamConfigDO teamConfigDO = decorationTeamConfigDAO.getById(teamId);
+        if (teamConfigDO==null){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+        }
+        //查询当前团队是否有门店使用 有的话 不能删除
+        Integer count = shopDecorationAssignDAO.countByTeamId(teamId);
+        if (count != null && count > 0){
+            throw new ServiceException(ErrorCodeEnum.TEAM_USED);
+        }
+        teamConfigDO.setDeleted(1);
+        teamAreaMappingDAO.deletedByTeamId(teamId);
+        decorationTeamConfigDAO.updateTeam(teamConfigDO);
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public PageInfo<DecorationTeamDTO> listByCondition(PageBasicInfo pageBasicInfo) {
+        PageHelper.startPage(pageBasicInfo.getPageNum(), pageBasicInfo.getPageSize());
+        List<DecorationTeamDTO> list = decorationTeamConfigDAO.listByCondition();
+        if (CollectionUtils.isEmpty(list)){
+            return new PageInfo<>();
+        }
+        List<Long> teamIds = list.stream().map(DecorationTeamDTO::getId).collect(Collectors.toList());
+        Map<Long, List<TeamAreaMappingDTO>> listMap = teamAreaMappingDAO.listByTeamIdList(teamIds);
+        list.forEach(x->{
+            x.setCityList(listMap.get(x.getId()));
+        });
+        PageInfo<DecorationTeamDTO> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public Long getDecorationTeamIdByCityId(Long openCityId) {
+        if (openCityId==null){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
+        }
+        TeamAreaMappingDO cityInfo = teamAreaMappingDAO.getByCityId(openCityId);
+        if (Objects.isNull(cityInfo)){
+            return null;
+        }
+        DecorationTeamConfigDO teamInfo = decorationTeamConfigDAO.getById(cityInfo.getTeamId());
+        return teamInfo.getId();
+    }
+
+    @Override
+    public Boolean handleDecorationTeam(ShopDecorationAssignDO shopDecorationAssign) {
+        //先查询
+        if (shopDecorationAssign == null){
+            log.info("handleDecorationTeam_error data not exist");
+            return Boolean.FALSE;
+        }
+        //如果门店是已经分配状态 则不能再次分配
+        if (DecorationDescStatus.ASSIGNED.getCode().equals(shopDecorationAssign.getDecorationDescStatus())){
+            log.info("handleDecorationTeam id:{},门店已分配", JSONObject.toJSONString(shopDecorationAssign));
+        }
+        //没有分配的门店 开始分配
+        ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(shopDecorationAssign.getShopId());
+        //查询装修团队
+        DecorationTeamConfigDO teamInfo = decorationTeamConfigDAO.getById(shopDecorationAssign.getDecorationTeamId());
+        if (teamInfo == null){
+            log.info("handleDecorationTeam_error team not exist");
+            return Boolean.FALSE;
+        }
+        //配置的系统是红圈通 且不是加盟公司自有店 则推送数据  也就是配置了crm或者是加盟公司自有店 走crm流程
+        if (teamInfo.getUseSystem().equals(DecorationUseSystemEnum.HQT.getCode())&&!shopInfoDO.getJoinMode().equals(JoinModeEnum.OWN_STORE.getCode())){
+            hqtAPIService.pushHqtBuild(signFranchiseService.getHqtBuildRequest(shopInfoDO.getId()));
+        }
+        shopDecorationAssign.setDecorationDescStatus(DecorationDescStatus.ASSIGNED.getCode());
+        shopDecorationAssignDAO.update(shopDecorationAssign);
+        //阶段
+        shopStageInfoDAO.updateShopStageInfo(shopInfoDO.getId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861);
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public PageInfo<DecorationListDTO> getDecorationAssignList(DecorationListRequest request) {
+        PageHelper.startPage(request.getPageNum(), request.getPageSize());
+        List<DecorationListDTO> decorationListDTOS = shopDecorationAssignDAO.listByCondition(request);
+        if (CollectionUtils.isEmpty(decorationListDTOS)){
+            return new PageInfo<>();
+        }
+        Set<String> regionIds = decorationListDTOS.stream().map(DecorationListDTO::getRegionId).collect(Collectors.toSet());
+        List<RegionDO> regionList = regionDao.getRegionByRegionIds(new ArrayList<>(regionIds));
+        //转为map
+        Map<String, String> regionMap = regionList.stream().collect(Collectors.toMap(RegionDO::getRegionId, RegionDO::getName));
+        decorationListDTOS.forEach(x->{
+            x.setRegionName(regionMap.get(x.getRegionId()));
+        });
+        return new PageInfo<>(decorationListDTOS);
+    }
+
+    @Override
+    public ShopSignerInfoDTO getShopSignerInfo(Long shopId) {
+        if (shopId==null){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
+        }
+        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
+        if (shopInfo == null){
+            throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
+        }
+        LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
+        ShopSignerInfoDTO shopSignerInfoDTO = new ShopSignerInfoDTO();
+        shopSignerInfoDTO.setPartnershipSignatoryFirst(lineInfo.getUsername());
+        shopSignerInfoDTO.setPartnershipSignatoryFirstMobile(lineInfo.getMobile());
+        SignFranchiseDO signFranchiseDO = signFranchiseDAO.selectByShopId(shopId);
+        if (signFranchiseDO!=null){
+            shopSignerInfoDTO.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
+            shopSignerInfoDTO.setPartnershipSignatorySecondMobile(signFranchiseDO.getPartnershipSignatorySecondMobile());
+        }
+        return shopSignerInfoDTO;
+    }
+
+    @Override
+    public Boolean updateConstructionTeam(UpdateConstructionTeamRequest request) {
+        //查询待分配门店信息
+        ShopDecorationAssignDO shopDecorationAssign = shopDecorationAssignDAO.getById(request.getId());
+        if (shopDecorationAssign == null){
+            log.info("handleDecorationTeam_error data not exist");
+            return Boolean.FALSE;
+        }
+        shopDecorationAssign.setDecorationTeamId(request.getTeamId());
+        handleDecorationTeam(shopDecorationAssign);
+        return Boolean.TRUE;
+    }
+
+
+    public String getNextNumber() {
+        Long current = redisUtilPool.incrby("counter_key", 1);
+        if (current == 1) {
+            // 如果是第一次，重新设置为 1（因为 increment 从 0 开始）
+            redisUtilPool.setString("counter_key", "1");
+            current = 1L;
+        }
+        return String.format("TD%04d", current);
+    }
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -5,13 +5,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.*;
+import com.cool.store.dao.decoration.DecorationTeamConfigDAO;
+import com.cool.store.dao.decoration.ShopDecorationAssignDAO;
+import com.cool.store.dao.decoration.TeamAreaMappingDAO;
 import com.cool.store.dto.PartnerBankInfoDTO;
 import com.cool.store.entity.*;
+import com.cool.store.entity.decoration.DecorationTeamConfigDO;
+import com.cool.store.entity.decoration.ShopDecorationAssignDO;
+import com.cool.store.entity.decoration.TeamAreaMappingDO;
 import com.cool.store.enums.*;
+import com.cool.store.enums.Decoration.DecorationDescStatus;
 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.mq.producer.SimpleMessageService;
 import com.cool.store.request.*;
 import com.cool.store.response.AddSignFranchiseResponse;
 import com.cool.store.response.ResponseResult;
@@ -27,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import sun.font.Decoration;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -120,6 +129,14 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
     OperationLogService operationLogService;
     @Resource
     OperationLogDAO operationLogDAO;
+    @Resource
+    TeamAreaMappingDAO teamAreaMappingDAO;
+    @Resource
+    DecorationTeamConfigDAO decorationTeamConfigDAO;
+    @Resource
+    ShopDecorationAssignDAO shopDecorationAssignDAO;
+    @Resource
+    private SimpleMessageService simpleMessageService;
 
 
     @Override
@@ -395,10 +412,26 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                         ));
                     }else{
                         //，加盟公司自有店->加盟公司建店 不推送数据 再crm中完成
-                        if ( !shopInfoDO.getJoinMode().equals(JoinModeEnum.OWN_STORE.getCode())){
-                            hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId()));
+                        //v2.0.0 先确认装修团队
+                        TeamAreaMappingDO city = teamAreaMappingDAO.getByCityId(shopInfoDO.getWantShopAreaId());
+                        //默认团队
+                        Long teamId = 1L;
+                        if (Objects.nonNull(city)) {
+                            //v2.0.0 确认团队
+                            DecorationTeamConfigDO decorationTeamConfigDO = decorationTeamConfigDAO.getById(city.getTeamId());
+                            if (Objects.nonNull(decorationTeamConfigDO)) {
+                                //v2.0.0 确认团队
+                                teamId = decorationTeamConfigDO.getId();
+                            }
+
                         }
-                        shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861);
+                        ShopDecorationAssignDO shopDecorationAssignDO = new ShopDecorationAssignDO();
+                        shopDecorationAssignDO.setDecorationDescStatus(DecorationDescStatus.TO_BE_ASSIGNED.getCode());
+                        shopDecorationAssignDO.setDecorationTeamId(teamId);
+                        shopDecorationAssignDO.setShopId(shopId);
+                        shopDecorationAssignDAO.insert(shopDecorationAssignDO);
+                        //新增一个延迟队列 四个小时之后确定是否手动分配 没有手动分配 直接自动分配  红圈通推送和下一个流程开始改为分配团队之后 触发
+                        simpleMessageService.send(String.valueOf(shopDecorationAssignDO.getId()), RocketMqTagEnum.DELAY_SHOP_DECORATION_ASSIGN,System.currentTimeMillis() + 4*60*60 * 1000);
                     }
                     shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER);
                     shopAuditInfoDO.setPassReason(request.getCause());
@@ -454,6 +487,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         }
     }
 
+    @Override
     public HqtBuildRequest getHqtBuildRequest(Long shopId) {
         ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
         LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId());