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

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

@@ -180,7 +180,9 @@ public enum ErrorCodeEnum {
     SHOP_ID_NOT_EXIST(103010,"shopId不存在",null),
     FIRST_ORDER_PARAM_NULL(103020,"首批订货金参数为空",null),
     XFSG_SERVICE_ERROR(103099,"鲜丰服务调用失败",null),
-    GET_FIRST_ORDER(103021,"获取鲜丰首批订货金失败",null)
+    GET_FIRST_ORDER(103021,"获取鲜丰首批订货金失败",null),
+
+    YLF_ERROR(110001, "云立方接口异常！", null),
     ;
 
 

coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java

@@ -21,11 +21,11 @@ public enum ShopSubStageEnum {
     SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 60, "加盟商/员工培训", 30),
     SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 1),
     SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 4),
-    SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 24),
+    SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 21),
-    SHOP_STAGE_10(ShopStageEnum.SHOP_STAGE_2, 100, "装修款", 25),
+    SHOP_STAGE_10(ShopStageEnum.SHOP_STAGE_2, 100, "装修款", 24),
-    SHOP_STAGE_11(ShopStageEnum.SHOP_STAGE_2, 110, "施工阶段", 29),
+    SHOP_STAGE_11(ShopStageEnum.SHOP_STAGE_2, 110, "施工阶段", 31),
-    SHOP_STAGE_12(ShopStageEnum.SHOP_STAGE_2, 120, "三方验收", 26),
+    SHOP_STAGE_12(ShopStageEnum.SHOP_STAGE_2, 120, "三方验收", 32),
-    SHOP_STAGE_13(ShopStageEnum.SHOP_STAGE_2, 130, "视觉验收", 26),
+    SHOP_STAGE_13(ShopStageEnum.SHOP_STAGE_2, 130, "视觉验收", 32),
     SHOP_STAGE_14(ShopStageEnum.SHOP_STAGE_2, 140, "开业运营方案", 23),
     SHOP_STAGE_15(ShopStageEnum.SHOP_STAGE_2, 150, "首批订货清单", 20),
     ;
@@ -124,6 +124,10 @@ public enum ShopSubStageEnum {
             case SHOP_STAGE_9:
             case SHOP_STAGE_10:
             case SHOP_STAGE_11:
+            case SHOP_STAGE_12:
+            case SHOP_STAGE_13:
+            case SHOP_STAGE_14:
+            case SHOP_STAGE_15:
                 return planSelectPointCompleteDate.plusDays(getPlanCompleteDays()).toString();
             default:
                 return null;

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AttachmentsDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:06
+ * @Version 1.0
+ */
+@Data
+public class AttachmentsDTO {
+    
+    private String title;
+    
+    private Long id;
+    
+    private String path;
+    
+    private String create;
+    
+    private String createDate;
+    
+    
+    
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDTO.java

@@ -0,0 +1,23 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:17
+ * @Version 1.0
+ */
+@Data
+public class BudgetDTO {
+    private Long id;
+    private String name;
+    private String type;
+    private String vzHj;
+    private String totalAmount;
+    private String totalCost;
+    private String createDate;
+    private String createBy;
+    private List<BudgetDetailDTO> details;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDetailDTO.java

@@ -0,0 +1,35 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:18
+ * @Version 1.0
+ */
+@Data
+public class BudgetDetailDTO {
+    private Long id;
+    private String nodeType;
+    private String number;
+    private String name;
+    private String unitName;
+    private String amount;
+    private String unitPrice;
+    private String totalPrice;
+    private String labour;
+    private String material;
+    private String mainMaterialCostPrice;
+    private String auxiliaryMaterialCostPrice;
+    private String labourCostPrice;
+    private String remark;
+    private BigDecimal loss;
+    private BigDecimal totalCost;
+    private BigDecimal cost;
+    private BigDecimal lossPrice;
+    private String planProfit;
+    private BigDecimal profitRate;
+    private String supplierName;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ConstructionScheduleDTO.java

@@ -0,0 +1,26 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:02
+ * @Version 1.0
+ */
+@Data
+public class ConstructionScheduleDTO {
+    private String id;
+    private String name;
+    private String planBeginDate;
+    private String planEndDate;
+    private String actualBeginDate;
+    private String actualEndDate;
+    private Integer duration;
+    private Integer state;
+    private List<AttachmentsDTO> attachments;
+    private List<TrackDataDTO> trackData;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationDTO.java

@@ -0,0 +1,24 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:21
+ * @Version 1.0
+ */
+@Data
+public class DecorationDTO {
+    private String projectId;
+    private String clientCode;
+    private String clientName;
+    private String pCode;
+    private String clientContractCode;
+    private String address;
+    private List<BudgetDTO> proposedBookBudget;
+    private List<DesignSchemeDTO>  designScheme;
+    private List<PaymentDTO> payment;
+    private List<ConstructionScheduleDTO>  constructionSchedule;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DesignSchemeDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:12
+ * @Version 1.0
+ */
+@Data
+public class DesignSchemeDTO {
+
+    private String id;
+    private String name;
+    private String remark;
+    private String date;
+    private String planBeginDate;
+    private String planEndDate;
+    private String beginDate;
+    private String endDate;
+    private Integer status;
+    private List<AttachmentsDTO> attachments;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/FileDTO.java

@@ -0,0 +1,21 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 14:53
+ * @Version 1.0
+ */
+@Data
+public class FileDTO {
+
+    private Long id;
+    private String path;
+    private String title;
+    private String create;
+    private String createDate;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/PaymentDTO.java

@@ -0,0 +1,28 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 15:14
+ * @Version 1.0
+ */
+@Data
+public class PaymentDTO {
+    private String id;
+    private String billDate;
+    private String billNo;
+    private String userName;
+    private BigDecimal amount;
+    private BigDecimal bDeAmount;
+    private String typeCategory;
+    private String accountName;
+    private Integer state;
+    private String auditTime;
+    private String auditUser;
+    private List<AttachmentsDTO> attachments;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ProjectDTO.java

@@ -0,0 +1,18 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午5:37
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ProjectDTO {
+    private String projectId;
+    private String clientCode;
+    private String clientName;
+    private String pCode;
+    private String address;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/TrackDataDTO.java

@@ -0,0 +1,26 @@
+package com.cool.store.dto.decoration;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 14:54
+ * @Version 1.0
+ */
+@Data
+public class TrackDataDTO {
+
+    private Long id;
+
+    private String person;
+
+    private String remark;
+
+    private String date;
+
+    private Integer RepalyId;
+
+    private List<FileDTO> file;
+}

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

@@ -88,17 +88,6 @@ public class ShopAuditInfoDO {
     @ApiModelProperty("数据类型 0-提交 1-审批")
     private Integer dataType;
 
-    @ApiModelProperty("头像")
-    private String avatar;
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
     /**
      * @return id
      */

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

@@ -21,4 +21,10 @@ public class ShopStageAcceptanceRequest {
     @ApiModelProperty("是否合格 0:不合格 1:合格")
     private Boolean result;
 
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java

@@ -0,0 +1,22 @@
+package com.cool.store.vo;
+
+import com.cool.store.vo.log.DesignLogVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午3:37
+ * @Version 1.0
+ * @注释:设计阶段信息
+ */
+@Data
+public class DesignInfoVo {
+
+    private String name;
+    private Integer resultType;
+    private String planTime;
+    private List<DesignLogVo> logs;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java

@@ -0,0 +1,22 @@
+package com.cool.store.vo.log;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午4:02
+ * @Version 1.0
+ * @注释:设计阶段跟踪日志
+ */
+@Data
+public class DesignLogVo {
+
+    private String logTime;
+    private String name;
+    private String description;
+    private String planTime;
+    private String finishTime;
+    private List<String> attachmentUrl;
+}

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

@@ -25,19 +25,7 @@ public interface CoolStoreStartFlowService {
      * @return
      */
     ResponseResult franchiseAgreement(FranchiseAgreementRequest request,Integer type);
-    /**
+
-     * @Auther: wangshuo
-     * @Date: 2024/4/25
-     * @description:项目列表
-     */
-    ResponseResult getProjectList(String shopCode);
-    /**
-     * @Auther: wangshuo
-     * @Date: 2024/4/25
-     * @description:项目详情
-     * @Param projectId:项目主键,clientCode:客户编号,pCode:项目编号
-     */
-    ResponseResult getStoreDetail(Long projectId,String clientCode,String pCode);
     /**
      * @Auther: wangshuo
      * @Date: 2024/4/25

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

@@ -0,0 +1,26 @@
+package com.cool.store.service;
+
+import com.cool.store.vo.DesignInfoVo;
+
+import java.util.List;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午4:45
+ * @Version 1.0
+ * @注释:
+ */
+public interface DecorationService {
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/4/28
+     * @description:获取装修阶段子阶段信息
+     */
+    List<DesignInfoVo> decorations();
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/4/28
+     * @description:设计阶段信息
+     */
+    List<DesignInfoVo>  DesignInfo(String shopCode);
+}

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

@@ -2,6 +2,7 @@ package com.cool.store.service;
 
 import com.cool.store.request.OpenAcceptanceRequest;
 import com.cool.store.request.ShopAcceptanceRequest;
+import com.cool.store.request.ShopStageAcceptanceRequest;
 import com.cool.store.vo.OpenAcceptanceInfoListVO;
 import com.cool.store.vo.ShopAcceptanceVO;
 import com.github.pagehelper.PageInfo;
@@ -31,4 +32,6 @@ public interface OpenAcceptanceInfoService {
      * @param shopAcceptanceRequest
      */
     void acceptance(ShopAcceptanceRequest shopAcceptanceRequest, String userId);
+
+    void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest);
 }

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

@@ -0,0 +1,23 @@
+package com.cool.store.service;
+
+import com.cool.store.dto.decoration.DecorationDTO;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 14:26
+ * @Version 1.0
+ */
+public interface YlfService {
+
+    /**
+     *
+     */
+    DecorationDTO getDecoration(Long id) ;
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/4/25
+     * @description:项目列表
+     */
+    String getProjectList(String shopCode);
+
+}

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

@@ -100,15 +100,15 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode());
         List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList());
         List<EnterpriseUserDO> userInfoByUserIds = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(userIds)){
+//        if (CollectionUtils.isNotEmpty(userIds)){
-            userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
+//            userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
-            Map<String, String> userAvatarMap = userInfoByUserIds.stream()
+//            Map<String, String> userAvatarMap = userInfoByUserIds.stream()
-                    .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar()))
+//                    .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar()))
-                    .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
+//                    .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
-            listByShopIdAndType.stream().forEach( item -> {
+//            listByShopIdAndType.stream().forEach( item -> {
-                item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
+//                item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
-            });
+//            });
-        }
+//        }
         submitLicenseResponse.setProcessRecords(listByShopIdAndType);
         return submitLicenseResponse;
     }

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

@@ -57,7 +57,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
         }
     }
 
-
     @Override
     public ResponseResult franchiseAgreement(FranchiseAgreementRequest request, Integer type) {
         log.info("newStore param:{}", JSONObject.toJSONString(request));
@@ -81,53 +80,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
         }
     }
 
-    @Override
-    public ResponseResult getProjectList(String shopCode) {
-        log.info("getProjectList param:{}", shopCode);
-        if (Objects.isNull(shopCode)) {
-            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
-        }
-        String url = String.format(Constants.GET_PROJECT_LIST, shopCode);
-        log.info("CoolStoreStartFlowServiceImpl#getOrder, url:{}", url);
-        try {
-            JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>());
-            log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject.toJSONString());
-            if (jsonObject.get("status").equals(Constants.SUCCESS)) {
-                return new ResponseResult(200, jsonObject.get("data").toString(), jsonObject.get("msg").toString());
-            } else {
-                return new ResponseResult(500, jsonObject.get("msg").toString());
-            }
-        } catch (Exception e) {
-            log.info("调用鲜丰服务异常,getProjectList error:{}", e);
-            throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR);
-        }
-
-    }
-
-    @Override
-    public ResponseResult getStoreDetail(Long projectId, String clientCode, String pCode) {
-        log.info("getStoreList projectId:{},clientCode:{},pCode:{}", projectId, clientCode, pCode);
-        if (Objects.isNull(projectId) && Objects.isNull(clientCode) && Objects.isNull(pCode)) {
-            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
-        }
-        HashMap requestMap = new HashMap();
-        requestMap.put("projectId", projectId);
-        requestMap.put("clientCode", clientCode);
-        requestMap.put("pCode", pCode);
-        try {
-            JSONObject jsonObject = httpRestTemplateService.getForObject(Constants.GET_PROJECT_DETAIL, JSONObject.class, requestMap);
-            log.info("FirstOrderServiceImp#getStoreDetail, jsonObject:{}", jsonObject.toJSONString());
-            if (jsonObject.get("status").equals(Constants.SUCCESS)) {
-                return new ResponseResult(200, jsonObject.get("data").toString(), jsonObject.get("msg").toString());
-            } else {
-                return new ResponseResult(500, jsonObject.get("msg").toString());
-            }
-        } catch (Exception e) {
-            log.info("调用鲜丰服务异常,getProjectList error:{}", e);
-            throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR);
-        }
-
-    }
 
     @Override
     public Boolean getFirstOrder(String shopCode) {
@@ -156,4 +108,5 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
         requestMap.put("timestamp", timestamp);
         requestMap.put("signature", signature);
     }
+
 }

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

@@ -0,0 +1,38 @@
+package com.cool.store.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dto.decoration.DecorationDTO;
+import com.cool.store.service.DecorationService;
+import com.cool.store.service.YlfService;
+import com.cool.store.vo.DesignInfoVo;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午4:46
+ * @Version 1.0
+ * @注释:
+ */
+@Service
+public class DecorationServiceImpl implements DecorationService {
+
+    @Resource
+    private YlfService ylfService;
+    @Override
+    public List<DesignInfoVo> decorations() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<DesignInfoVo> DesignInfo(String shopCode) {
+        String projectId = ylfService.getProjectList(shopCode);
+
+        return Collections.emptyList();
+    }
+}

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

@@ -13,6 +13,7 @@ import com.cool.store.enums.point.ShopSubStageFieldEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.OpenAcceptanceRequest;
 import com.cool.store.request.ShopAcceptanceRequest;
+import com.cool.store.request.ShopStageAcceptanceRequest;
 import com.cool.store.service.OpenAcceptanceInfoService;
 import com.cool.store.service.RegionService;
 import com.cool.store.utils.CoolDateUtils;
@@ -141,4 +142,21 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService
         shopInfoDO.setPlanOpenTime(shopAcceptanceRequest.getPlanOpenTime());
         shopInfoDAO.updateShopInfo(shopInfoDO);
     }
+
+    @Override
+    public void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest) {
+        OpenAcceptanceInfoDO openAcceptanceInfoDO = openAcceptanceInfoDAO.selectOne(OpenAcceptanceInfoDO.builder().shopId(shopStageAcceptanceRequest.getShopId()).build());
+        if (openAcceptanceInfoDO == null) {
+            throw new ServiceException("该店铺不存在");
+        }
+        if (openAcceptanceInfoDO.getAcceptanceStatus() != null && openAcceptanceInfoDO.getAcceptanceStatus() == 1) {
+            throw new ServiceException("该店铺已验收完成，不能再次验收");
+        }
+
+        ShopSubStageFieldEnum shopSubStageFieldEnum = ShopSubStageFieldEnum.getByShopSubStage(shopStageAcceptanceRequest.getShopSubStage());
+        if (shopSubStageFieldEnum != null) {
+            ReflectUtil.setFieldValue(openAcceptanceInfoDO, shopSubStageFieldEnum.getFiled(), shopStageAcceptanceRequest.getResult());
+        }
+        openAcceptanceInfoDAO.updateByPrimaryKeySelective(openAcceptanceInfoDO);
+    }
 }

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

@@ -198,7 +198,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
                     equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) {
               //  ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
                // String shopCode = shopInfo.getShopCode();
-               // Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
+               //Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
                 Boolean firstOrder =Boolean.TRUE;
                 log.info("saveOrder,flag:{}", firstOrder);
                 if (firstOrder) {

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

@@ -0,0 +1,90 @@
+package com.cool.store.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dto.decoration.DecorationDTO;
+import com.cool.store.dto.decoration.ProjectDTO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ServiceException;
+import com.cool.store.mq.util.HttpRestTemplateService;
+import com.cool.store.service.YlfService;
+import com.cool.store.utils.poi.constant.Constants;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 14:26
+ * @Version 1.0
+ */
+@Service
+@Slf4j
+public class YlfServiceImpl implements YlfService {
+
+    static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid=";
+
+    @Resource
+    private HttpRestTemplateService httpRestTemplateService;
+
+    @Override
+    public DecorationDTO getDecoration(Long id) {
+        String detailUrl = String.format("%s%d", url, id);
+        try {
+            String forObject = httpRestTemplateService.getForObject(detailUrl, String.class, new HashMap<>());
+            Integer status = (Integer) JSONObject.parseObject(forObject, JSONObject.class).get("status");
+            if (status != 200) {
+                log.info("获取云立方装修公司信息失败,id:{}", id);
+                throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
+            }
+            Object data = JSONObject.parseObject(forObject, JSONObject.class).get("data");
+            if (data == null) {
+                return null;
+            }
+            List<DecorationDTO> list = (List<DecorationDTO>) ((JSONObject) JSONObject.parseObject(forObject, JSONObject.class).get("data")).get("rows");
+            if (CollectionUtils.isNotEmpty(list)) {
+                return list.get(0);
+            }
+        } catch (Exception e) {
+            throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
+        }
+        return null;
+    }
+
+    @Override
+    public String getProjectList(String shopCode) {
+        log.info("getProjectList param:{}", shopCode);
+        if (Objects.isNull(shopCode)) {
+            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+        }
+        String url = String.format(Constants.GET_PROJECT_LIST, shopCode);
+        log.info("CoolStoreStartFlowServiceImpl#getOrder, url:{}", url);
+        try {
+            String jsonString = httpRestTemplateService.getForObject(url, String.class, new HashMap<>());
+            JSONObject jsonObject = JSONObject.parseObject(jsonString);
+            log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject);
+            if (jsonObject.get("status").equals(Constants.SUCCESS)) {
+                if (jsonObject.get("data").toString() == null) {
+                    return null;
+                }
+                List<ProjectDTO> projectDTOS = (List<ProjectDTO>) ((JSONObject) JSONObject.parseObject(jsonString, JSONObject.class).get("data")).get("rows");
+
+                return   ((ProjectDTO)projectDTOS.get(0)).getProjectId();
+            } else {
+                log.info("获取云立方装修公司信息失败,shopCode:{}", shopCode);
+                throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
+            }
+
+        } catch (Exception e) {
+            log.info("调用云立方获取项目列表异常,getProjectList error:{}", e);
+            throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR);
+        }
+
+    }
+
+
+}

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

@@ -3,11 +3,11 @@ package com.cool.store.controller.webb;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.request.OpenAcceptanceRequest;
 import com.cool.store.request.ShopAcceptanceRequest;
+import com.cool.store.request.ShopStageAcceptanceRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.OpenAcceptanceInfoService;
 import com.cool.store.vo.OpenAcceptanceInfoListVO;
 import com.cool.store.vo.ShopAcceptanceVO;
-import com.cool.store.vo.ShopStageAcceptanceVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @Author byd
@@ -54,4 +53,11 @@ public class OpenAcceptanceInfoController {
         return ResponseResult.success(Boolean.TRUE);
     }
 
+    @ApiOperation("开业验收-单项")
+    @PostMapping(path = "/acceptanceOne")
+    public ResponseResult<Boolean> acceptanceOne(@RequestBody ShopStageAcceptanceRequest shopStageAcceptanceRequest) {
+        openAcceptanceInfoService.acceptanceOne(shopStageAcceptanceRequest);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
 }

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

@@ -44,7 +44,7 @@ public class PCApplyLicenseController {
      * @param status 0通过 1不通过
      * @return
      */
-    @PostMapping(path = "/examine")
+    @GetMapping(path = "/examine")
     @ApiOperation("证照审批列表")
     public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
                                          @RequestParam("status") Integer status,

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

@@ -0,0 +1,33 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.CoolStoreStartFlowService;
+import com.cool.store.service.YlfService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午4:19
+ * @Version 1.0
+ * @注释:
+ */
+@RestController
+@RequestMapping("/pc/decoration")
+@Api(tags = "PC装修阶段")
+@Slf4j
+public class PCDecorationController {
+    @Resource
+    private YlfService ylfService;
+    @GetMapping("/get")
+    private ResponseResult get(){
+        String shopCode = "31310383";
+        return new ResponseResult<>(200,ylfService.getProjectList(shopCode)) ;
+
+    }
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java

@@ -42,7 +42,7 @@ public class ApplyLicenseController {
      * @param status 0通过 1不通过
      * @return
      */
-    @PostMapping(path = "/examine")
+    @GetMapping(path = "/examine")
     @ApiOperation("证照审批列表")
     public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
                                          @RequestParam("status") Integer status,

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniAssessmentTemplateController.java

@@ -0,0 +1,29 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.AssessmentTemplateService;
+import com.cool.store.vo.AssessmentTemplateVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 16:29
+ * @Version 1.0
+ */
+public class MiniAssessmentTemplateController {
+
+    @Resource
+    AssessmentTemplateService assessmentTemplateService;
+
+    @ApiOperation("检查项模板列表type 0 1 2 3")
+    @GetMapping("/listByType")
+    public ResponseResult<List<AssessmentTemplateVO>> intendPendingList(@RequestParam(value = "type",required = true)Integer type) {
+        return ResponseResult.success(assessmentTemplateService.listByType(type));
+    }
+
+}