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

2024-05-07 11:43:38 +08:00
parent d31461886d c79b926a02
commit c2982e7fe5
6 changed files with 85 additions and 69 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java
@@ -1,8 +1,11 @@
 package com.cool.store.dto.decoration;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.Date;
+
 /**
 * @Auther: WangShuo
 * @Date: 2024/05/06/下午3:09
@@ -12,11 +15,15 @@ import lombok.Data;
@Data
 public class ThreeAcceptanceDTO {
    @ApiModelProperty("验收签名 ")
-    private String acceptanceSignatures;
+    private String pic;
    @ApiModelProperty("验收评语")
-    private String comments;
+    private String remark;
    @ApiModelProperty("1通过，0不通过")
-    private Integer resultType;
+    private Integer result;
    @ApiModelProperty("验收时间")
-    private String acceptanceTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date acceptanceTime;
+    @ApiModelProperty
+    private Integer status;
+
 }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java
@@ -28,12 +28,7 @@ import java.util.List;
 */
 public interface DecorationService {

-    /**
-     * @Auther: wangshuo
-     * @Date: 2024/4/29
-     * @description:刷新
-     */
-    Boolean flush(Long shopId );
+
    /**
     * @Auther: wangshuo
     * @Date: 2024/5/3
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
@@ -89,11 +89,6 @@ public class DecorationServiceImpl implements DecorationService {
    @Resource
    private ShopInfoMapper shopInfoMapper;

-    @Override
-    public Boolean flush(Long shopId) {
-        //TODO
-        return null;
-    }

    @Override
    public FitmentResponse getFitmentSub(Long shopId) {
@@ -413,7 +408,7 @@ public class DecorationServiceImpl implements DecorationService {
    public Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request) {
        log.info("submitThreeCheck, request:{} ", JSONObject.toJSONString(request));
        Boolean flag = assessmentDataDAO.deleteByShopId(request.getShopId());
-        if (Boolean.FALSE.equals(flag)){
+        if (Boolean.FALSE.equals(flag)) {
            log.error("三方验收插入检查项失败");
            throw new ServiceException(ErrorCodeEnum.CHECK_ITEM);
        }
@@ -435,6 +430,10 @@ public class DecorationServiceImpl implements DecorationService {
    @Override
    public ThreeAcceptanceCheckRequest getThreeChecks(Long shopId) {
        List<AssessmentDataDO> assessmentDataDOS = assessmentDataDAO.selectListByShopId(shopId);
+        if (assessmentDataDOS.isEmpty()) {
+            log.error("该用户门店三方验收检查项为空");
+            return null;
+        }
        List<AssessmentDataDTO> assessmentDataDTOS = new ArrayList<>();
        for (AssessmentDataDO assessmentDataDO : assessmentDataDOS) {
            AssessmentDataDTO assessmentDataDTO = new AssessmentDataDTO();
@@ -452,29 +451,23 @@ public class DecorationServiceImpl implements DecorationService {
        try {
            //工程部验收签名
            if (Objects.nonNull(request.getEngineeringAcceptance())) {
-                JSONObject engineering = new JSONObject();
-                engineering.put("pic", request.getEngineeringAcceptance().getAcceptanceSignatures());
-                engineering.put("acceptanceTime", new Date());
-                engineering.put("result", request.getEngineeringAcceptance().getResultType());
-                engineering.put("remark", request.getEngineeringAcceptance().getComments());
-                engineering.put("status", 1);
+                request.getEngineeringAcceptance().setAcceptanceTime(new Date());
+                request.getEngineeringAcceptance().setStatus(CommonConstants.ONE);
+                String jsonString = JSONObject.toJSONString(request.getEngineeringAcceptance());
                AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
                acceptanceInfoDO.setShopId(request.getShopId());
-                acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString());
+                acceptanceInfoDO.setEngineeringAcceptanceSignatures(jsonString);
                acceptanceInfoDO.setUpdateTime(new Date());
                acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
            }
            //加盟商
            if (Objects.nonNull(request.getPartnerAcceptance())) {
-                JSONObject partner = new JSONObject();
-                partner.put("pic", request.getPartnerAcceptance().getAcceptanceSignatures());
-                partner.put("acceptanceTime", new Date());
-                partner.put("result", request.getPartnerAcceptance().getResultType());
-                partner.put("remark", request.getPartnerAcceptance().getComments());
-                partner.put("status", 1);
+                request.getPartnerAcceptance().setStatus(CommonConstants.ONE);
+                request.getPartnerAcceptance().setAcceptanceTime(new Date());
+                String jsonString = JSONObject.toJSONString(request.getPartnerAcceptance());
                AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
                acceptanceInfoDO.setShopId(request.getShopId());
-                acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString());
+                acceptanceInfoDO.setPartnerAcceptanceSignatures(jsonString);
                acceptanceInfoDO.setUpdateTime(new Date());
                acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
            }
@@ -603,22 +596,19 @@ public class DecorationServiceImpl implements DecorationService {
            if (StringUtils.isNotEmpty(acceptanceInfoDO1.getEngineeringAcceptanceSignatures())
                    && StringUtils.isNotEmpty(acceptanceInfoDO1.getPartnerAcceptanceSignatures())
                    && Objects.nonNull(request.getOperationsAcceptance())) {
-                JSONObject engineering = JSONObject.parseObject(acceptanceInfoDO1.getEngineeringAcceptanceSignatures());
-                JSONObject partner = JSONObject.parseObject(acceptanceInfoDO1.getPartnerAcceptanceSignatures());
-                JSONObject operations = new JSONObject();
-                operations.put("pic", request.getOperationsAcceptance().getAcceptanceSignatures());
-                operations.put("acceptanceTime", new Date());
-                operations.put("result", request.getOperationsAcceptance().getResultType());
-                operations.put("remark", request.getOperationsAcceptance().getComments());
-                operations.put("status", 1);
+                ThreeAcceptanceDTO engineering = JSONObject.parseObject(acceptanceInfoDO1.getEngineeringAcceptanceSignatures(), ThreeAcceptanceDTO.class);
+                ThreeAcceptanceDTO partner = JSONObject.parseObject(acceptanceInfoDO1.getPartnerAcceptanceSignatures(), ThreeAcceptanceDTO.class);
+                request.getOperationsAcceptance().setStatus(CommonConstants.ONE);
+                request.getOperationsAcceptance().setAcceptanceTime(new Date());
+                String jsonString = JSONObject.toJSONString(request.getOperationsAcceptance());
                AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
                acceptanceInfoDO.setShopId(request.getShopId());
-                acceptanceInfoDO.setOperationsAcceptanceSignatures(operations.toString());
+                acceptanceInfoDO.setOperationsAcceptanceSignatures(jsonString);
                acceptanceInfoDO.setUpdateTime(new Date());
                acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
-                if (AuditResultTypeEnum.PASS.getCode() == operations.getInteger("result")
-                        && AuditResultTypeEnum.PASS.getCode() == partner.getInteger("result")
-                        && AuditResultTypeEnum.PASS.getCode() == engineering.getInteger("result")) {
+                if (AuditResultTypeEnum.PASS.getCode() == request.getOperationsAcceptance().getResult()
+                        && AuditResultTypeEnum.PASS.getCode() == partner.getResult()
+                        && AuditResultTypeEnum.PASS.getCode() == engineering.getResult()) {
                    //更新阶段状态验收完毕
                    shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123, null);
                    preparationService.whetherToOpenForAcceptance(request.getShopId());
@@ -640,37 +630,40 @@ public class DecorationServiceImpl implements DecorationService {

        ThreeSignResponse threeSignResponse = new ThreeSignResponse();
        AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
-        if (Objects.isNull(acceptanceInfoDO)){
+        if (Objects.isNull(acceptanceInfoDO)) {
            return threeSignResponse;
        }
        //工程部
        if (StringUtils.isNotEmpty(acceptanceInfoDO.getEngineeringAcceptanceSignatures())) {
-            JSONObject engineering = JSONObject.parseObject(acceptanceInfoDO.getEngineeringAcceptanceSignatures());
+            ThreeAcceptanceDTO engineering = JSONObject.parseObject(acceptanceInfoDO.getEngineeringAcceptanceSignatures(), ThreeAcceptanceDTO.class);
            ThreeAcceptanceDTO engineeringDTO = new ThreeAcceptanceDTO();
-            engineeringDTO.setAcceptanceSignatures(engineering.getString("pic"));
-            engineeringDTO.setComments(engineering.getString("remark"));
-            engineeringDTO.setResultType(engineering.getInteger("result"));
-            engineeringDTO.setAcceptanceTime(engineering.getString("acceptanceTime"));
+            engineeringDTO.setPic(engineering.getPic());
+            engineeringDTO.setRemark(engineering.getRemark());
+            engineeringDTO.setResult(engineering.getResult());
+            engineeringDTO.setAcceptanceTime(engineering.getAcceptanceTime());
+            engineeringDTO.setStatus(engineering.getStatus());
            threeSignResponse.setEngineeringAcceptance(engineeringDTO);
        }
        //营运部
        if (StringUtils.isNotEmpty(acceptanceInfoDO.getOperationsAcceptanceSignatures())) {
-            JSONObject operations = JSONObject.parseObject(acceptanceInfoDO.getOperationsAcceptanceSignatures());
+            ThreeAcceptanceDTO operations = JSONObject.parseObject(acceptanceInfoDO.getOperationsAcceptanceSignatures(), ThreeAcceptanceDTO.class);
            ThreeAcceptanceDTO operationsDTO = new ThreeAcceptanceDTO();
-            operationsDTO.setAcceptanceSignatures(operations.getString("pic"));
-            operationsDTO.setComments(operations.getString("remark"));
-            operationsDTO.setResultType(operations.getInteger("result"));
-            operationsDTO.setAcceptanceTime(operations.getString("acceptanceTime"));
+            operationsDTO.setPic(operations.getPic());
+            operationsDTO.setRemark(operations.getRemark());
+            operationsDTO.setResult(operations.getResult());
+            operationsDTO.setAcceptanceTime(operations.getAcceptanceTime());
+            operationsDTO.setStatus(operations.getStatus());
            threeSignResponse.setOperationsAcceptance(operationsDTO);
        }
        //加盟商
        if (StringUtils.isNotEmpty(acceptanceInfoDO.getPartnerAcceptanceSignatures())) {
-            JSONObject partner = JSONObject.parseObject(acceptanceInfoDO.getPartnerAcceptanceSignatures());
+            ThreeAcceptanceDTO partner = JSONObject.parseObject(acceptanceInfoDO.getPartnerAcceptanceSignatures(), ThreeAcceptanceDTO.class);
            ThreeAcceptanceDTO partnerDTO = new ThreeAcceptanceDTO();
-            partnerDTO.setAcceptanceSignatures(partner.getString("pic"));
-            partnerDTO.setComments(partner.getString("remark"));
-            partnerDTO.setResultType(partner.getInteger("result"));
-            partnerDTO.setAcceptanceTime(partner.getString("acceptanceTime"));
+            partnerDTO.setPic(partner.getPic());
+            partnerDTO.setRemark(partner.getRemark());
+            partnerDTO.setResult(partner.getResult());
+            partnerDTO.setAcceptanceTime(partner.getAcceptanceTime());
+            partnerDTO.setStatus(partner.getStatus());
            threeSignResponse.setPartnerAcceptance(partnerDTO);
        }
        return threeSignResponse;
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java
@@ -5,9 +5,11 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.dto.decoration.ConstructionScheduleDTO;
 import com.cool.store.request.BookingAcceptanceRequest;
+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.ThreeSignResponse;
 import com.cool.store.service.DecorationService;
 import com.cool.store.vo.Fitment.DecorationModelVO;
 import com.cool.store.vo.Fitment.DesignInfoVo;
@@ -36,12 +38,7 @@ import java.util.List;
 public class PCDecorationController {
    @Resource
    private DecorationService decorationService;
-    @ApiOperation("刷新")
-    @GetMapping("/flush")
-    public ResponseResult<Boolean> flush(@RequestParam Long shopId) {
-        return ResponseResult.success(decorationService.flush(shopId));
-    }
-    @ApiOperation("获取新店装修下阶段的数据")
+    @ApiOperation("获取新店装修子阶段信息")
    @GetMapping("/getFitmentSub")
    public ResponseResult<FitmentResponse> getFitmentSub(@RequestParam Long shopId) {
        return ResponseResult.success(decorationService.getFitmentSub(shopId));
@@ -73,10 +70,19 @@ public class PCDecorationController {
    public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){
        return ResponseResult.success(decorationService.bookingAcceptance(response));
    }
-
+    @ApiOperation("获取三方验收检查项")
+    @GetMapping("/getAcceptanceChecks")
+    public ResponseResult<ThreeAcceptanceCheckRequest> getAcceptanceChecks(@RequestParam Long shopId){
+        return ResponseResult.success(decorationService.getThreeChecks(shopId));
+    }
    @ApiOperation("提交三方验收签字")
    @PostMapping("/submitThreeAcceptanceSign")
    public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody ThreeAcceptanceRequest request){
        return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request));
    }
+    @ApiOperation("查看三方验收签字")
+    @GetMapping("/getThreeSign")
+    public ResponseResult<ThreeSignResponse> getThreeAcceptance(@RequestParam Long shopId){
+        return ResponseResult.success(decorationService.getThreeAcceptanceSign(shopId));
+    }
 }
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
@@ -96,7 +96,6 @@ public class MiniDecorationController {
    @ApiOperation("提交三方验收签字")
    @PostMapping("/submitThreeAcceptanceSign")
    public ResponseResult<Boolean> submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){
-
        return ResponseResult.success(decorationService.miniSubmitAcceptanceSign(request));
    }
    @ApiOperation("查看三方验收签字")
--- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
@@ -160,8 +160,8 @@ public class XxlJobHandler {
     * @Date: 2024/4/29
     * @description: 每天更新装修阶段进场时间等，至预约状态
     */
-    @XxlJob("acceptanceInfo")
-    public void AcceptanceInfoHandler() {
+    @XxlJob("fitmentAcceptanceHandler")
+    public void fitmentAcceptanceHandler() {
        boolean hasNext = true;
        int PageNum = 1;
        int PageSize = 50;
@@ -217,7 +217,6 @@ public class XxlJobHandler {
                        if (datePlusFiveDays.equals(now)) {
                            shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120);
                        }
-                        //TODO 短信通知
                    } catch (ParseException e) {
                        log.error("初始化acceptanceInfo，鲜丰服务进场时间日期转化异常");
                    }
@@ -228,7 +227,24 @@ public class XxlJobHandler {
        }

    }
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/7
+     * @description:三方验收预约短信通知
+     */
+    @XxlJob("ThreeAcceptanceMessage")
+    public void ThreeAcceptanceMessage(){
+        log.info("------三方验收预约短信通知-----");
+        boolean hasNext = true;
+        int PageNum = 1;
+        int PageSize = 50;
+        while (hasNext) {

+           // hasNext = ;
+            PageNum++;
+        }
+
+    }
    @XxlJob("interviewRemind")
    public void interviewRemind() {
        log.info("------面试提醒------");