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

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

@@ -17,4 +17,6 @@ public class ThreeAcceptanceDTO {
     private String comments;
     @ApiModelProperty("0通过，1不通过")
     private Integer resultType;
+    @ApiModelProperty("验收时间")
+    private String acceptanceTime;
 }

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

@@ -1,5 +1,7 @@
 package com.cool.store.entity;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import java.util.Date;
 import javax.persistence.*;
 
@@ -54,15 +56,16 @@ 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;
-
     /**
      * 加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
      */

coolstore-partner-model/src/main/java/com/cool/store/response/ThreeSignResponse.java

@@ -0,0 +1,21 @@
+package com.cool.store.response;
+
+import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/05/06/下午5:50
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ThreeSignResponse {
+    @ApiModelProperty("工程部验收")
+    private ThreeAcceptanceDTO engineeringAcceptance;
+    @ApiModelProperty("营运部验收")
+    private ThreeAcceptanceDTO operationsAcceptance;
+    @ApiModelProperty("加盟商验收")
+    private ThreeAcceptanceDTO partnerAcceptance;
+}

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

@@ -10,6 +10,7 @@ import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ThreeAcceptanceResponse;
+import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.vo.Fitment.DecorationStageVO;
 import com.cool.store.vo.Fitment.DecorationModelVO;
 import com.cool.store.vo.Fitment.DesignInfoVo;
@@ -119,12 +120,7 @@ public interface DecorationService {
      * @description:预约验收
      */
     Boolean bookingAcceptance(BookingAcceptanceRequest response);
-    /**
+
-     * @Auther: wangshuo
-     * @Date: 2024/4/29
-     * @description:查看三方验收
-     */
-    ThreeAcceptanceResponse getThreeAcceptance(Long shopId);
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/3

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

@@ -22,6 +22,7 @@ import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ThreeAcceptanceResponse;
+import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.*;
 import com.cool.store.utils.poi.StringUtils;
 import com.cool.store.vo.Fitment.DecorationStageVO;
@@ -633,6 +634,7 @@ public class DecorationServiceImpl implements DecorationService {
             engineeringDTO.setAcceptanceSignatures(engineering.getString("pic"));
             engineeringDTO.setComments(engineering.getString("remark"));
             engineeringDTO.setResultType(engineering.getInteger("result"));
+            engineeringDTO.setAcceptanceTime(engineering.getString("acceptanceTime"));
             threeAcceptanceDTOS.add(CommonConstants.ZERO, engineeringDTO);
         }
         //营运部
@@ -642,6 +644,7 @@ public class DecorationServiceImpl implements DecorationService {
             operationsDTO.setAcceptanceSignatures(operations.getString("pic"));
             operationsDTO.setComments(operations.getString("remark"));
             operationsDTO.setResultType(operations.getInteger("result"));
+            operationsDTO.setAcceptanceTime(operations.getString("acceptanceTime"));
             threeAcceptanceDTOS.add(CommonConstants.ONE, operationsDTO);
         }
         //加盟商
@@ -651,6 +654,7 @@ public class DecorationServiceImpl implements DecorationService {
             partnerDTO.setAcceptanceSignatures(partner.getString("pic"));
             partnerDTO.setComments(partner.getString("remark"));
             partnerDTO.setResultType(partner.getInteger("result"));
+            partnerDTO.setAcceptanceTime(partner.getString("acceptanceTime"));
             threeAcceptanceDTOS.add(CommonConstants.TWO, partnerDTO);
         }
         return threeAcceptanceDTOS;
@@ -667,14 +671,7 @@ public class DecorationServiceImpl implements DecorationService {
         return Boolean.TRUE;
     }
 
-    @Override
+
-    public ThreeAcceptanceResponse getThreeAcceptance(Long shopId) {
-        AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
-        ThreeAcceptanceResponse response = new ThreeAcceptanceResponse();
-        BeanUtil.copyProperties(acceptanceInfoDO, response);
-        response.setAcceptanceTime(acceptanceInfoDO.getUpdateTime());
-        return response;
-    }
 
     private DecorationDTO getDecorationDTO(Long shopId) {
         List<Long> shopIds = new ArrayList<>();

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

@@ -74,14 +74,10 @@ public class PCDecorationController {
     public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){
         return ResponseResult.success(decorationService.bookingAcceptance(response));
     }
-    @ApiOperation("查看三方验收")
+
-    @GetMapping("/getThreeAcceptance")
+    @ApiOperation("提交三方验收签字")
-    public ResponseResult<ThreeAcceptanceResponse> getThreeAcceptance(@RequestParam Long shopId){
+    @PostMapping("/submitThreeAcceptanceSign")
-        return ResponseResult.success(decorationService.getThreeAcceptance(shopId));
+    public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody ThreeAcceptanceRequest request){
-    }
-    @ApiOperation("提交三方验收")
-    @PostMapping("/submitThreeAcceptance")
-    public ResponseResult<Boolean> submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){
         return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request));
     }
 }

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

@@ -3,12 +3,14 @@ package com.cool.store.controller.webc;
 import com.cool.store.context.PartnerUserHolder;
 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.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.response.ThreeAcceptanceResponse;
+import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.AssessmentTemplateService;
 import com.cool.store.service.DecorationService;
 import com.cool.store.vo.AssessmentTemplateVO;
@@ -97,9 +99,9 @@ public class MiniDecorationController {
 
         return ResponseResult.success(decorationService.miniSubmitAcceptanceSign(request));
     }
-    @ApiOperation("查看三方验收")
+    @ApiOperation("查看三方验收签字")
-    @GetMapping("/getThreeAcceptance")
+    @GetMapping("/getThreeSign")
-    public ResponseResult<ThreeAcceptanceResponse> getThreeAcceptance(@RequestParam Long shopId){
+    public ResponseResult<List<ThreeAcceptanceDTO> > getThreeAcceptance(@RequestParam Long shopId){
-        return ResponseResult.success(decorationService.getThreeAcceptance(shopId));
+        return ResponseResult.success(decorationService.getThreeAcceptanceSign(shopId));
     }
 }