Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java

@@ -1,5 +1,7 @@
 package com.cool.store.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -80,6 +82,9 @@ public class CoolDateUtils {
 
 
     public static final Date parseDate(String dateString ,String format){
+        if (StringUtils.isBlank(dateString)){
+            return null;
+        }
         DateFormat dateFormat = new SimpleDateFormat(format);
         Date date = null;
         try {

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java

@@ -65,6 +65,7 @@ public class ShopStageInfoDAO {
                 addShopStageList.add(shopStageInfo);
             }
         }
+        //发送短信
         return shopStageInfoMapper.batchInsert(addShopStageList);
     }
 
@@ -229,5 +230,16 @@ public class ShopStageInfoDAO {
                                                          List<Integer> shopSubStageStatusList,String investmentUserId,Integer queryUserType){
         return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId,queryUserType);
     }
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/9
+     * @description:获取处于XXXX阶段的列表
+     */
+    public List<ShopStageInfoDO> getSubStageList(List<Long> shopIds, Integer shopSubStage){
+        if(CollectionUtils.isEmpty(shopIds) || shopSubStage == null){
+            return Collections.emptyList();
+        }
+        return shopStageInfoMapper.getSubStageList(shopIds,shopSubStage);
+    }
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java

@@ -13,7 +13,7 @@ public interface AssessmentDataMapper extends Mapper<AssessmentDataDO> {
      * @Date: 2024/5/8
      * @description:三方验收
      */
-    Integer batchUpdate(List<AssessmentDataDO> AssessmentDataDOS);
+    Integer batchUpdate(@Param("AssessmentDataDOS") List<AssessmentDataDO> AssessmentDataDOS);
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/8

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java

@@ -84,7 +84,7 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/3
-     * @description:根据区域id查询所有处于的店铺
+     * @description:根据区域id查询所有处于XXX的店铺
      */
-    List<ShopInfoDO> selectShopListByRegionId(@Param("regionIds") List<Long> regionIds,@Param("status")Integer status);
+    List<ShopInfoDO> selectShopListByRegionId(@Param("regionIds") List<Long> regionIds,@Param("subStageStatus")List<Integer> subStageStatus);
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

@@ -130,5 +130,5 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
                                                   @Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
                                                   @Param("investmentUserId") String investmentUserId,
                                                   @Param("queryUserType") Integer queryUserType);
-
+    List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
 }

coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml

@@ -5,26 +5,32 @@
         <!--
           WARNING - @mbg.generated
         -->
-    <id column="id" jdbcType="BIGINT" property="id" />
+        <id column="id" jdbcType="BIGINT" property="id"/>
-    <result column="shop_id" jdbcType="BIGINT" property="shopId" />
+        <result column="shop_id" jdbcType="BIGINT" property="shopId"/>
-    <result column="actual_entry_time" jdbcType="TIMESTAMP" property="actualEntryTime" />
+        <result column="actual_entry_time" jdbcType="TIMESTAMP" property="actualEntryTime"/>
-    <result column="planned_completion_time" jdbcType="TIMESTAMP" property="plannedCompletionTime" />
+        <result column="planned_completion_time" jdbcType="TIMESTAMP" property="plannedCompletionTime"/>
-    <result column="planned_start_time" jdbcType="TIMESTAMP" property="plannedStartTime" />
+        <result column="planned_start_time" jdbcType="TIMESTAMP" property="plannedStartTime"/>
-    <result column="decoration_planned_completion_time" jdbcType="TIMESTAMP" property="decorationPlannedCompletionTime" />
+        <result column="decoration_planned_completion_time" jdbcType="TIMESTAMP"
-    <result column="decoration_planned_start_time" jdbcType="TIMESTAMP" property="decorationPlannedStartTime" />
+                property="decorationPlannedCompletionTime"/>
-    <result column="construction_completion_time" jdbcType="TIMESTAMP" property="constructionCompletionTime" />
+        <result column="decoration_planned_start_time" jdbcType="TIMESTAMP" property="decorationPlannedStartTime"/>
-    <result column="engineering_acceptance_signatures" jdbcType="VARCHAR" property="engineeringAcceptanceSignatures" />
+        <result column="construction_completion_time" jdbcType="TIMESTAMP" property="constructionCompletionTime"/>
-    <result column="operations_acceptance_signatures" jdbcType="VARCHAR" property="operationsAcceptanceSignatures" />
+        <result column="engineering_acceptance_signatures" jdbcType="VARCHAR"
-    <result column="partner_acceptance_signatures" jdbcType="VARCHAR" property="partnerAcceptanceSignatures" />
+                property="engineeringAcceptanceSignatures"/>
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="operations_acceptance_signatures" jdbcType="VARCHAR" property="operationsAcceptanceSignatures"/>
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="partner_acceptance_signatures" jdbcType="VARCHAR" property="partnerAcceptanceSignatures"/>
-    <result column="deleted" jdbcType="BIT" property="deleted" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="deleted" jdbcType="BIT" property="deleted"/>
+        <result column="plan_acceptance_time" jdbcType="TIMESTAMP" property="planAcceptanceTime"/>
+        <result column="actual_acceptance_time" jdbcType="TIMESTAMP" property="actualAcceptanceTime"/>
+        <result column="booking_user" jdbcType="VARCHAR" property="bookingUser"/>
     </resultMap>
     <sql id="baseColumn">
-    id,shop_id,actual_entry_time,planned_completion_time,planned_start_time,decoration_planned_completion_time,
+        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
+           create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user
     </sql>
     <update id="updateByShopIDSelective">
         update xfsg_acceptance_info
@@ -62,11 +68,21 @@
             <if test="deleted != null">
                 deleted = #{deleted} ,
             </if>
+            <if test="planAcceptanceTime !=null ">
+                plan_acceptance_time  =#{planAcceptanceTime},
+            </if>
+            <if test="actualAcceptanceTime !=null ">
+                actual_acceptance_time  =#{actualAcceptanceTime},
+            </if>
+            <if test="bookingUser !=null ">
+                booking_user  =#{bookingUser},
+            </if>
         </set>
         where shop_id = #{shopId}
     </update>
     <select id="selectShopIdListBySignatures" resultType="com.cool.store.entity.AcceptanceInfoDO">
-    select <include refid="baseColumn"/>
+        select
+        <include refid="baseColumn"/>
         from xfsg_acceptance_info a
         left join join xfsg_shop_stage_info b on a.shop_id = b.shop_id
         where b.shop_sub_stage_status = #{status} and a.deleted = 0

coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml

@@ -57,11 +57,13 @@
           qualified = CASE id
           <foreach collection="AssessmentDataDOS" separator=" " item="item">
               WHEN #{item.id} THEN #{item.qualified}
-      </foreach>,
+          </foreach>
+          END,
           reason = CASE id
           <foreach collection="AssessmentDataDOS" separator=" " item="item">
               WHEN #{item.id} THEN #{item.reason}
-      </foreach>,
+          </foreach>
+          END,
           comments = CASE id
           <foreach collection="AssessmentDataDOS" separator=" " item="item">
               WHEN #{item.id} THEN #{item.comments}
@@ -69,7 +71,7 @@
           END
       </set>
       where id in (
-    <foreach collection="addShopStageList" item="item" separator=",">
+      <foreach collection="AssessmentDataDOS" item="item" separator=",">
           #{item.id}
       </foreach>
       )

coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml

@@ -54,7 +54,7 @@
         e.training_store_id as trainingStoreId,
         e.estimated_assessment_time as estimatedAssessmentTime,
         e.actual_assessment_time as actualAssessmentTime,
-        e.assign_flag as assignFlag
+        ifnull(e.assign_flag,0) as assignFlag
         from xfsg_temp_user_detail u
         left join xfsg_employee_training e on e.xfsg_user_detail_id = u.id
         left join xfsg_shop_info s on s.id = u.shop_id
@@ -74,9 +74,12 @@
                 #{item}
             </foreach>
         </if>
-        <if test="assignFlag != null">
+        <if test="assignFlag != null and assignFlag == 1">
             and e.assign_flag = #{assignFlag}
         </if>
+        <if test="assignFlag != null and assignFlag == 0">
+            and e.assign_flag is null
+        </if>
         <if test="beginTime != null and beginTime != ''">
             and u.register_time &gt;= #{beginTime}
         </if>
@@ -101,8 +104,11 @@
         <if test="assessmentStatus != null and assessmentStatus == 1">
             and e.assessment_total_num = e.assessment_num
         </if>
-        <if test="assignStoreFlag != null">
+        <if test="assignStoreFlag != null and assignStoreFlag == 1">
-            and s.store_num not null
+            and s.store_num is not null
+        </if>
+        <if test="assignStoreFlag != null and assignStoreFlag == 0">
+            and s.store_num is null
         </if>
     </select>
     <select id="trainingListByShopId" resultType="com.cool.store.vo.EmployeeTrainingVO">

coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml

@@ -17,8 +17,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <select id="selectByShopId" resultType="com.cool.store.dto.openPreparation.FirstOrderDTO">
-    select id, total_order_deposit as totalOrderDeposit, latest_payment_date as latestPaymentDate ,
+    select *
-      estimated_cost as estimatedCost ,fruits_cost as fruitsCost
     from xfsg_first_order
     where shop_id = #{shopId}
   </select>

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -162,8 +162,11 @@
       </if>
       AND xssi.shop_sub_stage_status != -100
       and xssi.shop_sub_stage = 120
-      <if test="status != null">
+      <if test="subStageStatus != null and subStageStatus.size()>0">
-          and xssi.shop_sub_stage_status = #{status}
+          and xssi.shop_sub_stage_status in
+        <foreach collection="subStageStatus" item="item" index="index" open="(" separator="," close=")">
+          #{item}
+        </foreach>
       </if>
     </select>
 

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -252,4 +252,18 @@
     </where>
 
   </select>
+  <select id="getSubStageList" resultType="com.cool.store.entity.ShopStageInfoDO">
+    select *
+    from xfsg_shop_stage_info
+    where 1=1
+    <if test="shopIds !=null and shopIds.size()>0">
+      and shop_id in
+      <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
+        #{shopId}
+      </foreach>
+    </if>
+    <if test="shopSubStage !=null">
+     and  shop_sub_stage =#{shopSubStage}
+    </if>
+  </select>
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java

@@ -32,7 +32,12 @@ public class FirstOrderDTO {
 
     @ApiModelProperty("创建人")
     private String createUserId;
-
+    @ApiModelProperty("加盟商")
+    private String partnerName;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
     @ApiModelProperty("更新人")
     private String updateUserId;
 

coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java

@@ -1,7 +1,4 @@
 package com.cool.store.entity;
-
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
 import java.util.Date;
 import javax.persistence.*;
 
@@ -56,14 +53,12 @@ public class AcceptanceInfoDO {
     /**
      * 工程部验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":1}
      */
-
     @Column(name = "engineering_acceptance_signatures")
     private String engineeringAcceptanceSignatures;
 
     /**
      * 营运部验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":1}
      */
-
     @Column(name = "operations_acceptance_signatures")
     private String operationsAcceptanceSignatures;
     /**
@@ -88,6 +83,43 @@ public class AcceptanceInfoDO {
      * 是否删除：0.否 1.是
      */
     private Boolean deleted;
+    /**
+     * 计划验收时间
+     */
+    private Date planAcceptanceTime;
+
+    /**
+     * 实际验收时间
+     */
+    private Date actualAcceptanceTime;
+    /**
+     * 预约人
+     */
+    private String bookingUser;
+
+    public Date getPlanAcceptanceTime() {
+        return planAcceptanceTime;
+    }
+
+    public void setPlanAcceptanceTime(Date planAcceptanceTime) {
+        this.planAcceptanceTime = planAcceptanceTime;
+    }
+
+    public Date getActualAcceptanceTime() {
+        return actualAcceptanceTime;
+    }
+
+    public void setActualAcceptanceTime(Date actualAcceptanceTime) {
+        this.actualAcceptanceTime = actualAcceptanceTime;
+    }
+
+    public String getBookingUser() {
+        return bookingUser;
+    }
+
+    public void setBookingUser(String bookingUser) {
+        this.bookingUser = bookingUser;
+    }
 
     /**
      * @return id

coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java

@@ -0,0 +1,20 @@
+package com.cool.store.request;
+
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/05/09/下午5:27
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class AcceptanceListRequest {
+
+    private List<Integer> subStageStatus;
+    private Integer pageNum;
+    private Integer pageSize;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/BookingAcceptanceRequest.java

@@ -15,7 +15,6 @@ import java.util.Date;
 @Data
 public class BookingAcceptanceRequest {
     private Long shopId;
-    @ApiModelProperty("预约验收实际")
+    @ApiModelProperty("预约验收时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date bookingAcceptanceTime;
 }

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

@@ -4,10 +4,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dto.decoration.ConstructionScheduleDTO;
 import com.cool.store.dto.decoration.DecorationModelDTO;
 import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
-import com.cool.store.request.LinePaySubmitRequest;
+import com.cool.store.request.*;
-import com.cool.store.request.ThreeAcceptanceCheckRequest;
-import com.cool.store.request.ThreeAcceptanceRequest;
-import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 
 import com.cool.store.response.ThreeSignResponse;
@@ -107,13 +104,13 @@ public interface DecorationService {
      * @Date: 2024/5/3
      * @description:预约验收
      */
-    Boolean bookingAcceptance(BookingAcceptanceRequest response);
+    Boolean bookingAcceptance(BookingAcceptanceRequest response,LoginUserInfo user);
 
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/3
      * @description:获取验收列表
      */
-    PageInfo<fitmentCheckVO> getFitmentAcceptanceList(Integer subStageStatus, LoginUserInfo user,Integer pageNum,Integer pageSize);
+    PageInfo<fitmentCheckVO> getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user);
 
 }

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

@@ -71,7 +71,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
         String url = null;
         if (Constants.ONE_INTEGER == type) {
             url = xfsgUrl + Constants.FRANCHISE_AGREEMENT_COMPANY + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature");
-        } else if (Constants.ZERO_INTEGER == type) {
+        } else if (Constants.TWO_INTEGER == type) {
             url = xfsgUrl + Constants.FRANCHISE_AGREEMENT_PERSON + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature");
         }
         InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, request, InitiatingResponse.class);

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

@@ -17,10 +17,7 @@ import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.LineInfoMapper;
 import com.cool.store.mapper.ShopInfoMapper;
-import com.cool.store.request.LinePaySubmitRequest;
+import com.cool.store.request.*;
-import com.cool.store.request.ThreeAcceptanceCheckRequest;
-import com.cool.store.request.ThreeAcceptanceRequest;
-import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 
 import com.cool.store.response.ThreeSignResponse;
@@ -403,6 +400,8 @@ public class DecorationServiceImpl implements DecorationService {
     @Override
     public Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request) {
         try {
+            ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_10);
+            if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_102.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) {
                 //工程部验收签名
                 if (Objects.nonNull(request.getEngineeringAcceptance())) {
                     request.getEngineeringAcceptance().setAcceptanceTime(new Date());
@@ -428,6 +427,8 @@ public class DecorationServiceImpl implements DecorationService {
                 //更新阶段状态验收中
                 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122);
                 return Boolean.TRUE;
+            }
+            return Boolean.FALSE;
         } catch (Exception e) {
             log.error("mini提交三方验收失败");
             throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE);
@@ -435,8 +436,7 @@ public class DecorationServiceImpl implements DecorationService {
     }
 
     @Override
-    public PageInfo<fitmentCheckVO> getFitmentAcceptanceList(Integer subStageStatus, LoginUserInfo user, Integer
+    public PageInfo<fitmentCheckVO> getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user) {
-            pageNum, Integer pageSize) {
         List<String> authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
         List<Long> regions = new ArrayList<>();
         for (String authRegionId : authRegionIds) {
@@ -448,8 +448,8 @@ public class DecorationServiceImpl implements DecorationService {
         }
         List<fitmentCheckVO> fitmentCheckVOList = new ArrayList<>();
         //shopId,lineid,regionid,shopname,storenum,
-        PageHelper.startPage(pageNum, pageSize);
+        PageHelper.startPage(request.getPageNum(), request.getPageSize());
-        List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, subStageStatus);
+        List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, request.getSubStageStatus());
         PageInfo pageInfo = new PageInfo<>(shopInfoDOS);
         if (shopInfoDOS.isEmpty()) {
             log.info("该工程部监理下门店为空");
@@ -457,7 +457,8 @@ public class DecorationServiceImpl implements DecorationService {
         }
         Map<Long, ShopInfoDO> ShopIdmap = shopInfoDOS.stream().collect(Collectors.toMap(ShopInfoDO::getId, dto1 -> dto1));
         //招商经理，选址人员（拓展经理）id
-        List<Long> lineIds = shopInfoDOS.stream().map(ShopInfoDO::getLineId).collect(Collectors.toList());
+        List<Long> lineIds = shopInfoDOS.stream().filter(o->o.getLineId()!=null)
+                .map(ShopInfoDO::getLineId).distinct().collect(Collectors.toList());
         List<LineInfoDO> lineInfos = lineInfoMapper.getByLineIds(lineIds);
         Map<Long, LineInfoDO> lineInfoDOMap = lineInfos.stream().collect(Collectors.toMap(LineInfoDO::getId, dto -> dto));
         //招商name
@@ -479,43 +480,50 @@ public class DecorationServiceImpl implements DecorationService {
             String userName = enterpriseUserDAO.getUserName(fightMangerUserId);
             fightManger.put(regionId, userName);
         }
-        //施工计划完成时间 //施工实际完成实际//验收状态//计划验收时间//验收实际时间
+        //施工计划完成时间 //施工实际完成实际//计划验收时间//验收实际时间
-        Map<Long, ShopStageInfoDO> ShopStageInfoDOMap = new HashMap<>();
+        List<Long> shopIds = new ArrayList<>(ShopIdmap.keySet());
-        for (Long shopId : ShopIdmap.keySet()) {
+        List<AcceptanceInfoDO> acceptanceInfoDOS = acceptanceInfoDAO.selectByShopIds(shopIds);
-            ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_12);
+        Map<Long, AcceptanceInfoDO> acceptanceInfoDOSMap = acceptanceInfoDOS.stream()
-            ShopStageInfoDOMap.put(shopId, shopSubStageInfo);
+                .collect(Collectors.toMap(AcceptanceInfoDO::getShopId, dto1 -> dto1));
-        }
+        //验收状态
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage());
+        Map<Long, ShopStageInfoDO> ShopStageInfoDOMap = subStageList.stream()
+                .collect(Collectors.toMap(ShopStageInfoDO::getShopId, dto1 -> dto1));
         for (ShopInfoDO shopInfoDO : shopInfoDOS) {
+            Long shopId = shopInfoDO.getId();
+            Long lineId = shopInfoDO.getLineId();
+            Long regionId = shopInfoDO.getRegionId();
             fitmentCheckVO fitmentCheckVO = new fitmentCheckVO();
-            fitmentCheckVO.setShopId(shopInfoDO.getId());
+            fitmentCheckVO.setShopId(shopId);
+            fitmentCheckVO.setLineId(lineId);
             fitmentCheckVO.setShopName(shopInfoDO.getShopName());
             fitmentCheckVO.setStoreNum(shopInfoDO.getStoreNum());
-            fitmentCheckVO.setLineId(shopInfoDO.getLineId());
+            fitmentCheckVO.setRegionId(regionId);
-            fitmentCheckVO.setRegionId(shopInfoDO.getRegionId());
+            fitmentCheckVO.setRegion(regionNameMap.get(regionId));
-            fitmentCheckVO.setRegion(regionNameMap.get(shopInfoDO.getRegionId()));
+            fitmentCheckVO.setFightManager(fightManger.get(regionId));
-            fitmentCheckVO.setFightManager(fightManger.get(shopInfoDO.getRegionId()));
+            if (lineId != null) {
-            if (shopInfoDO.getLineId() != null) {
+                fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(lineId)
-                fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(shopInfoDO.getLineId())
                         .getInvestmentManager());
-                fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId())
+                fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(lineId)
                         .getInvestmentManager()));
-                fitmentCheckVO.setSitterId(lineInfoDOMap.get(shopInfoDO.getLineId())
+                fitmentCheckVO.setSitterId(lineInfoDOMap.get(lineId)
                         .getDevelopmentManager());
-                fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId())
+                fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(lineId)
                         .getDevelopmentManager()));
-                fitmentCheckVO.setPartnerName(lineInfoDOMap.get(shopInfoDO.getLineId()).getUsername());
+                fitmentCheckVO.setPartnerName(lineInfoDOMap.get(lineId).getUsername());
             }
-            if (shopInfoDO.getId() != null) {
+            AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDOSMap.get(shopId);
-                if (Objects.nonNull(ShopStageInfoDOMap.get(shopInfoDO.getId()))) {
+            if (shopId != null) {
-                    Date PlanEndTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY);
+                if (Objects.nonNull(acceptanceInfoDO)) {
-                    fitmentCheckVO.setPlanEndTime(PlanEndTime);
+                    fitmentCheckVO.setPlanEndTime(acceptanceInfoDO.getDecorationPlannedCompletionTime());
-                    Date actualEndDate = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getActualCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY);
+                    fitmentCheckVO.setActualEndTime(acceptanceInfoDO.getConstructionCompletionTime());
-                    fitmentCheckVO.setActualEndTime(actualEndDate);
+                    fitmentCheckVO.setPlanAcceptanceTime(acceptanceInfoDO.getPlanAcceptanceTime());
-                    Date PlanAcceptanceTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY);
+                    fitmentCheckVO.setAcceptanceTime(acceptanceInfoDO.getActualAcceptanceTime());
-                    fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime);
-                    fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopInfoDO.getId()).getShopSubStageStatus());
                 }
             }
+            if (Objects.nonNull(ShopStageInfoDOMap.get(shopId))) {
+            fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopId).getShopSubStageStatus());
+            }
             fitmentCheckVOList.add(fitmentCheckVO);
         }
         pageInfo.setList(fitmentCheckVOList);
@@ -541,10 +549,11 @@ public class DecorationServiceImpl implements DecorationService {
                 acceptanceInfoDO.setShopId(request.getShopId());
                 acceptanceInfoDO.setOperationsAcceptanceSignatures(jsonString);
                 acceptanceInfoDO.setUpdateTime(new Date());
+                acceptanceInfoDO.setActualAcceptanceTime(new Date());
                 acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
-                if (AuditResultTypeEnum.PASS.getCode() == request.getOperationsAcceptance().getResult()
+                if (CommonConstants.ONE == request.getOperationsAcceptance().getResult()
-                        && AuditResultTypeEnum.PASS.getCode() == partner.getResult()
+                        && CommonConstants.ONE == partner.getResult()
-                        && AuditResultTypeEnum.PASS.getCode() == engineering.getResult()) {
+                        && CommonConstants.ONE == engineering.getResult()) {
                     //更新阶段状态验收完毕
                     shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123, null);
                     preparationService.whetherToOpenForAcceptance(request.getShopId());
@@ -588,15 +597,20 @@ public class DecorationServiceImpl implements DecorationService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean bookingAcceptance(BookingAcceptanceRequest request) {
+    public Boolean bookingAcceptance(BookingAcceptanceRequest request,LoginUserInfo user) {
-
         shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121);
         ShopStageInfoDO newShopStageInfoDO = new ShopStageInfoDO();
-        CoolDateUtils.parseDate(request.getBookingAcceptanceTime().toString(), CoolDateUtils.DATE_FORMAT_SEC);
+        SimpleDateFormat sdf = new SimpleDateFormat(CoolDateUtils.DATE_FORMAT_SEC);
-        newShopStageInfoDO.setPlanCompleteTime(request.getBookingAcceptanceTime().toString());
+        String date = sdf.format(request.getBookingAcceptanceTime());
+        newShopStageInfoDO.setPlanCompleteTime(date);
         newShopStageInfoDO.setShopSubStage(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage());
         newShopStageInfoDO.setShopId(request.getShopId());
         shopStageInfoDAO.updateByShopId(newShopStageInfoDO);
+        AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(request.getShopId());
+        acceptanceInfoDO.setBookingUser(user.getUserId());
+        acceptanceInfoDO.setUpdateTime(new Date());
+        acceptanceInfoDO.setPlanAcceptanceTime(new Date());
+        acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
         return Boolean.TRUE;
     }
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.FirstOrderDAO;
 import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.dto.openPreparation.FirstOrderDTO;
@@ -50,7 +51,8 @@ public class FirstOrderServiceImp implements FirstOrderService {
     private ShopStageInfoDAO shopStageInfoDAO;
     @Resource
     private CoolStoreStartFlowService coolStoreStartFlowService;
-
+    @Resource
+    private EnterpriseUserDAO enterpriseUserDAO;
     @Override
     public Integer saveOrder(FirstOrderRequest request, LoginUserInfo user) {
         log.info("save order:{}", JSONObject.toJSONString(request));
@@ -116,11 +118,17 @@ public class FirstOrderServiceImp implements FirstOrderService {
         ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15);
         if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()))
         {
+
+            String userName = enterpriseUserDAO.getUserName(order.getCreateUserId());
+            order.setPartnerName(userName);
             order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus());
             return order;
         }
         if (Objects.nonNull(order)) {
             try {
+
+                String userName = enterpriseUserDAO.getUserName(order.getCreateUserId());
+                order.setPartnerName(userName);
                 ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId());
                 String storeNum = shopInfo.getStoreNum();
                 Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum);

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

@@ -27,10 +27,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
-import java.util.Objects;
 
 @Service
 @Slf4j
@@ -174,14 +172,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         temp.add("object");
         Convert.digitToChinese(123);
         FranchiseAgreementRequest buildResult = FranchiseAgreementRequest.builder()
-                .apply_user(user.getJobNumber())
+//                .apply_user(user.getJobNumber())
+                .apply_user("20230724")
                 .company(0)
-                .start1(DateUtils.dateTime(franchiseFeeDO.getFirstYearStartTime()))
+                .start1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getFirstYearStartTime()))
-                .start2(DateUtils.dateTime(franchiseFeeDO.getSecondYearStartTime()))
+                .start2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getSecondYearStartTime()))
-                .start3(DateUtils.dateTime(franchiseFeeDO.getThirdYearStartTime()))
+                .start3(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getThirdYearStartTime()))
-                .end1(DateUtils.dateTime(franchiseFeeDO.getFirstYearEndTime()))
+                .end1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getFirstYearEndTime()))
-                .end2(DateUtils.dateTime(franchiseFeeDO.getSecondYearEndTime()))
+                .end2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getSecondYearEndTime()))
-                .end3(DateUtils.dateTime(franchiseFeeDO.getThirdYearEndTime()))
+                .end3(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getThirdYearEndTime()))
                 .fjsc(temp)
                 .fqgsmc("鲜丰水果股份有限公司")
                 .fzzd1(0)
@@ -201,7 +200,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 .is_business_license(request.getIsBusinessLicense())
                 .is_deposit(1)
                 .is_food_license(request.getIsFoodLicense())
-                .jiaokuandate(DateUtils.dateTime(linePayDO.getPayTime()))
+                .jiaokuandate(getDateTimeFormat(Constants.TIME_STAMP_FLAG,linePayDO.getPayTime()))
                 .jkr(linePayDO.getPayUserName())
                 .jmd_area(pointInfoDO.getDistrict())
                 .jmd_city(pointInfoDO.getCity())
@@ -239,7 +238,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 .jmssfzhm(signingBaseInfoDO.getIdCardNo())
                 .jmsxm(lineInfoDO.getPartnerNum())
                 .jmsxm1(lineInfoDO.getUsername())
-                .jsrq(DateUtils.dateTime(request.getContractStartEndTime()))
+                .jsrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,request.getContractStartEndTime()))
                 .jszhhz(linePayDO.getPayAccount())
                 .kdzBusinessId(AuditEnum.SIGN_FRANCHISE + "_" + shopId + "_" + lineId)
                 .khhjzh(linePayDO.getBankName())
@@ -256,7 +255,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 .ppsyfbl(Double.valueOf(request.getBrandFee()))
                 .psfl("以实际结算为准")
                 .qsdz("PUBLIC_COMPANY")
-                .qsrq(DateUtils.dateTime(request.getContractStartTime()))
+                .qsrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,request.getContractStartTime()))
                 .qylx(SignTypeEnum.getWorkflowStageByCode(request.getSignType()).getCode())
                 .qys_dzyz("2731707107593166911")
                 .qys_htywfl("3051420203180101971")
@@ -264,12 +263,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 .remark(request.getRemark())
                 .remark2(systemBuildingShopDO.getReasons())
                 .sfbq__add(request.getResign())
-                .sj1(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END, request.getBusinessStartHours()))
+                .sj1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_THREE,request.getBusinessStartHours()))
-                .sj2(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END, request.getBusinessEndHours()))
+                .sj2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_THREE,request.getBusinessEndHours()))
                 .social_credit_code(licenseTransactDO.getCreditCode())
                 .spltxkz(temp)
                 .sqr_name(user.getName())
-                .sqrq(DateUtils.getDate())
+                .sqrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,new Date()))
                 .title("特许经营合同审批申请2023-" + lineInfoDO.getUsername() + "-" + DateUtils.getDate())
                 .wlyzbm("201905081151092R")
                 .yycs(Integer.valueOf(request.getImpressionNum()))
@@ -398,4 +397,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         }
         return addSignFranchiseResponse;
     }
+
+    public static String getDateTimeFormat(String pattern,Date date) {
+        return new SimpleDateFormat(pattern).format(date);
+    }
 }

coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java

@@ -193,12 +193,19 @@ public class Constants
 
     public static final Integer ONE_INTEGER = 1;
 
+
+    public static final Integer TWO_INTEGER = 2;
+
     public static final String INSERT_FLAG = "insert";
 
     public static final String UPDATE_FLAG = "update";
 
     public static final String TIME_STAMP_FLAG = "yyyy-MM-dd";
 
+    public static final String TIME_STAMP_FLAG_TWO = "yyyyMMdd";
+
+    public static final String TIME_STAMP_FLAG_THREE = "HH:mm";
+
     public static final String GET_PROJECT_LIST = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectByCustomLable&remark=%s";
     public static final String GET_PROJECT_DETAIL= "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails";
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java

@@ -4,6 +4,7 @@ import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.dto.decoration.ConstructionScheduleDTO;
+import com.cool.store.request.AcceptanceListRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
@@ -64,15 +65,16 @@ public class PCDecorationController {
         return ResponseResult.success(decorationService.getDecorationModel(shopId,null));
     }
     @ApiOperation("获取验收列表：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过")
-    @GetMapping("/getAcceptanceList")
+    @PostMapping("/getAcceptanceList")
-    public ResponseResult<PageInfo<fitmentCheckVO>> getAcceptanceList(@RequestParam Integer subStageStatus, @RequestParam Integer pageNum,@RequestParam Integer pageSize){
+    public ResponseResult<PageInfo<fitmentCheckVO>> getAcceptanceList(@RequestBody AcceptanceListRequest request){
         LoginUserInfo user = CurrentUserHolder.getUser();
-        return ResponseResult.success(decorationService.getFitmentAcceptanceList(subStageStatus,user,pageNum,pageSize));
+        return ResponseResult.success(decorationService.getFitmentAcceptanceList(request,user));
     }
     @ApiOperation("预约验收")
     @PostMapping("/bookingAcceptance")
     public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){
-        return ResponseResult.success(decorationService.bookingAcceptance(response));
+        LoginUserInfo user = CurrentUserHolder.getUser();
+        return ResponseResult.success(decorationService.bookingAcceptance(response,user));
     }
     @ApiOperation("获取三方验收检查项")
     @GetMapping("/getAcceptanceChecks")