From ddaa9bd1fe04a1aa12c1919a95bb28dc46a86f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Mon, 3 Nov 2025 15:33:41 +0800
Subject: [PATCH] feat:handleDecorationTeam

---
 .../decoration/ShopDecorationAssignMapper.xml |  2 ++
 .../com/cool/store/dto/ShopSignerInfoDTO.java | 26 ++++++++++++++
 .../dto/decoration/DecorationListDTO.java     |  5 +++
 .../service/DecorationHandleService.java      | 10 +++++-
 .../impl/DecorationHandleServiceImpl.java     | 35 +++++++++++++++----
 .../webb/DecorationAllocationController.java  | 19 +++++++---
 6 files changed, 86 insertions(+), 11 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/ShopSignerInfoDTO.java

diff --git a/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml
index b7c9e78b3..c27cc4510 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/decoration/ShopDecorationAssignMapper.xml
@@ -20,8 +20,10 @@
 
   <select id="listByCondition" resultType="com.cool.store.dto.decoration.DecorationListDTO">
     SELECT
+      zsda.id as id ,
       zsda.shop_id AS shopId,
       zsda.decoration_desc_status as decorationDescStatus,
+      zsda.decoration_team_id as teamId,
       xsi.shop_name AS shopName,
       xsi.shop_code AS shopCode,
       xsi.region_id AS regionId,
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopSignerInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopSignerInfoDTO.java
new file mode 100644
index 000000000..2d8163262
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopSignerInfoDTO.java
@@ -0,0 +1,26 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 15:22
+ * @Version 1.0
+ */
+@Data
+public class ShopSignerInfoDTO {
+
+    @ApiModelProperty("签约人1姓名")
+    private String partnershipSignatoryFirst;
+
+    @ApiModelProperty("签约人1手机号")
+    private String partnershipSignatoryFirstMobile;
+
+    @ApiModelProperty("签约人2姓名")
+    private String partnershipSignatorySecond;
+
+    @ApiModelProperty("签约人2手机号")
+    private String partnershipSignatorySecondMobile;
+
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationListDTO.java
index 8abea507f..65570aad8 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationListDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationListDTO.java
@@ -11,6 +11,11 @@ import lombok.Data;
 @Data
 public class DecorationListDTO {
 
+    private Long id;
+
+    @ApiModelProperty("装修团队ID")
+    private Long teamId;
+
     @ApiModelProperty("门店ID")
     private Long shopId;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationHandleService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationHandleService.java
index a1a186f84..2c8edcaa6 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationHandleService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationHandleService.java
@@ -1,6 +1,7 @@
 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.request.decoration.AddTeamRequest;
@@ -65,7 +66,14 @@ public interface DecorationHandleService {
      * @param request
      * @return
      */
-    PageInfo<DecorationListDTO> listByCondition(DecorationListRequest request);
+    PageInfo<DecorationListDTO> getDecorationAssignList(DecorationListRequest request);
+
+    /**
+     * 获取门店签约信息
+     * @param shopId
+     * @return
+     */
+    ShopSignerInfoDTO getShopSignerInfo(Long shopId);
 
 
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java
index 32d31431f..949d94eff 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java
@@ -1,17 +1,15 @@
 package com.cool.store.service.impl;
 
 import com.cool.store.common.PageBasicInfo;
-import com.cool.store.dao.RegionDao;
-import com.cool.store.dao.ShopInfoDAO;
-import com.cool.store.dao.ShopStageInfoDAO;
+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.RegionDO;
-import com.cool.store.entity.ShopInfoDO;
+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;
@@ -68,6 +66,10 @@ public class DecorationHandleServiceImpl implements DecorationHandleService {
     SignFranchiseService signFranchiseService;
     @Resource
     RegionDao regionDao;
+    @Resource
+    LineInfoDAO lineInfoDAO;
+    @Resource
+    private SignFranchiseDAO signFranchiseDAO;
 
     @Override
     public Boolean addTeam(AddTeamRequest request) {
@@ -184,7 +186,7 @@ public class DecorationHandleServiceImpl implements DecorationHandleService {
     }
 
     @Override
-    public PageInfo<DecorationListDTO> listByCondition(DecorationListRequest request) {
+    public PageInfo<DecorationListDTO> getDecorationAssignList(DecorationListRequest request) {
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
         List<DecorationListDTO> decorationListDTOS = shopDecorationAssignDAO.listByCondition(request);
         if (CollectionUtils.isEmpty(decorationListDTOS)){
@@ -200,6 +202,27 @@ public class DecorationHandleServiceImpl implements DecorationHandleService {
         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;
+    }
+
 
     public String getNextNumber() {
         Long current = redisUtilPool.incrby("counter_key", 1);
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java
index 8fa3dc4f9..83acdeacf 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java
@@ -1,8 +1,11 @@
 package com.cool.store.controller.webb;
 
 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.request.decoration.AddTeamRequest;
+import com.cool.store.request.decoration.DecorationListRequest;
 import com.cool.store.request.decoration.UpdateTeamRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.DecorationHandleService;
@@ -10,10 +13,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -57,5 +57,16 @@ public class DecorationAllocationController {
         return ResponseResult.success(decorationHandleService.listByCondition(pageBasicInfo));
     }
 
+    @PostMapping("/getDecorationAssignList")
+    @ApiOperation("装修分配列表/待办列表 查询待办时 分配状态传-0")
+    public ResponseResult<PageInfo<DecorationListDTO>> getDecorationAssignList(@RequestBody DecorationListRequest pageBasicInfo){
+        return ResponseResult.success(decorationHandleService.getDecorationAssignList(pageBasicInfo));
+    }
 
+
+    @PostMapping("/getShopSignerInfo")
+    @ApiOperation("详情中获取签约人信息")
+    public ResponseResult<ShopSignerInfoDTO> getShopSignerInfo(@RequestParam("shopId") Long shopId){
+        return ResponseResult.success(decorationHandleService.getShopSignerInfo(shopId));
+    }
 }