From 98bfbfb362c84b28419a01f836a1f1dc37790585 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 6 May 2024 17:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/AssessmentDataDAO.java | 3 + .../store/mapper/AssessmentDataMapper.java | 4 +- .../resources/mapper/AssessmentDataMapper.xml | 5 + .../dto/decoration/AssessmentDataDTO.java | 5 +- .../dto/decoration/ThreeAcceptanceDTO.java | 6 +- .../store/request/ThreeAcceptanceRequest.java | 2 - .../store/service/AssessmentDataService.java | 2 + .../cool/store/service/DecorationService.java | 26 ++- .../service/impl/DecorationServiceImpl.java | 153 ++++++++++++------ .../cool/store/config/SignValidateFilter.java | 1 + .../webb/PCDecorationController.java | 2 +- .../webc/MiniDecorationController.java | 15 +- 12 files changed, 154 insertions(+), 70 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java index b1f3ebcc7..958c8b2cf 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java @@ -68,4 +68,7 @@ public class AssessmentDataDAO { return assessmentDataMapper.selectByPrimaryKey(id); } + public List selectListByShopId(Long shopId) { + return assessmentDataMapper.selectListByShopId(shopId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java index b561316ad..603771196 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java @@ -8,5 +8,7 @@ import tk.mybatis.mapper.common.Mapper; import java.util.List; public interface AssessmentDataMapper extends Mapper { - Integer batchUpdate( List AssessmentDataDOS); + Integer batchUpdate(List AssessmentDataDOS); + + List selectListByShopId(@Param("shopId") Long shopId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml index f7a342bf0..f7c748f3e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml @@ -41,4 +41,9 @@ ) + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java index 67b707a29..d9293ae57 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java @@ -17,22 +17,19 @@ import javax.persistence.Id; @Data public class AssessmentDataDTO { + @ApiModelProperty("模板id") private Long templateId; - - private Long shopId; /** * 店铺是否合格 */ @ApiModelProperty("店铺是否合格，0合格1不合格") private Boolean qualified; - /** * 原因 */ @ApiModelProperty("不合格原因") private String reason; - /** * 评语 */ diff --git 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 index 1232d2d26..70a02fc5f 100644 --- 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 @@ -12,9 +12,9 @@ import lombok.Data; @Data public class ThreeAcceptanceDTO { @ApiModelProperty("验收签名 ") - private String AcceptanceSignatures; + private String acceptanceSignatures; @ApiModelProperty("验收评语") - private String Comments; + private String comments; @ApiModelProperty("0通过，1不通过") - private Integer ResultType; + private Integer resultType; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java index 782497eec..30bd292c5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java @@ -22,6 +22,4 @@ public class ThreeAcceptanceRequest { private ThreeAcceptanceDTO operationsAcceptance; @ApiModelProperty("加盟商验收") private ThreeAcceptanceDTO partnerAcceptance; - @ApiModelProperty("检查项") - private List assessmentDataDOS; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentDataService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentDataService.java index ce652ce68..2b816f0c0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentDataService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentDataService.java @@ -15,4 +15,6 @@ public interface AssessmentDataService { Boolean batchInsert(List assessmentDataDOS); Integer batchUpdate(List assessmentDataDOS); + + } diff --git 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 index 48487696c..a6b40fa90 100644 --- 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 @@ -3,6 +3,7 @@ package com.cool.store.service; 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.ThreeAcceptanceCheckRequest; import com.cool.store.request.ThreeAcceptanceRequest; @@ -88,7 +89,30 @@ public interface DecorationService { * @description:提交三方验收检查项 */ Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request); - Boolean submitAcceptance(ThreeAcceptanceRequest request,PartnerUserInfoVO minUser, LoginUserInfo pcUser ); + /** + * @Auther: wangshuo + * @Date: 2024/5/6 + * @description:查看三方验收检查项 + */ + ThreeAcceptanceCheckRequest getThreeChecks(Long shopId); + /** + * @Auther: wangshuo + * @Date: 2024/5/6 + * @description:mini提交三方验收检签字 + */ + Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request); + /** + * @Auther: wangshuo + * @Date: 2024/5/6 + * @description:pc提交三方验收检签字 + */ + Boolean pcSubmitAcceptanceSign(ThreeAcceptanceRequest request); + /** + * @Auther: wangshuo + * @Date: 2024/5/6 + * @description:查看三方验收签字 + */ + List getThreeAcceptanceSign(Long shopId); /** * @Auther: wangshuo * @Date: 2024/5/3 diff --git 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 index 62f88f738..19fc23607 100644 --- 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 @@ -58,7 +58,7 @@ public class DecorationServiceImpl implements DecorationService { private static final Logger log = LoggerFactory.getLogger(DecorationServiceImpl.class); @Resource - private ShopAuditInfoDAO shopAuditInfoDAO; + private AssessmentDataDAO assessmentDataDAO; @Resource private SysRoleService sysRoleService; @Resource @@ -412,9 +412,11 @@ public class DecorationServiceImpl implements DecorationService { public Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request) { log.info("submitThreeCheck, request:{} ", JSONObject.toJSONString(request)); List assessmentDataDOS = new ArrayList<>(); - BeanUtil.copyProperties(request.getAssessmentDataDTOS(),assessmentDataDOS); - for(AssessmentDataDO assessmentDataDO : assessmentDataDOS){ + for (AssessmentDataDTO assessmentDataDTO : request.getAssessmentDataDTOS()) { + AssessmentDataDO assessmentDataDO = new AssessmentDataDO(); + BeanUtil.copyProperties(assessmentDataDTO, assessmentDataDO); assessmentDataDO.setShopId(request.getShopId()); + assessmentDataDOS.add(assessmentDataDO); } Boolean assessment = assessmentDataService.batchInsert(assessmentDataDOS); if (assessment == Boolean.FALSE) { @@ -424,6 +426,53 @@ public class DecorationServiceImpl implements DecorationService { return assessment; } + @Override + public ThreeAcceptanceCheckRequest getThreeChecks(Long shopId) { + List assessmentDataDOS = assessmentDataDAO.selectListByShopId(shopId); + List assessmentDataDTOS = new ArrayList<>(); + for (AssessmentDataDO assessmentDataDO : assessmentDataDOS) { + AssessmentDataDTO assessmentDataDTO = new AssessmentDataDTO(); + BeanUtil.copyProperties(assessmentDataDO, assessmentDataDTO); + assessmentDataDTOS.add(assessmentDataDTO); + } + ThreeAcceptanceCheckRequest threeAcceptanceCheckRequest = new ThreeAcceptanceCheckRequest(); + threeAcceptanceCheckRequest.setShopId(shopId); + threeAcceptanceCheckRequest.setAssessmentDataDTOS(assessmentDataDTOS); + return threeAcceptanceCheckRequest; + } + + @Override + public Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request) { + try { + //工程部验收签名 + 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); + //加盟商 + 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); + AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setShopId(request.getShopId()); + acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString()); + acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString()); + acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); + //更新阶段状态验收中 + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); + return Boolean.TRUE; + } catch (Exception e) { + log.error("mini提交三方验收失败"); + throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE); + } + } + @Override public PageInfo getFitmentAcceptanceList(Integer subStageStatus, LoginUserInfo user, Integer pageNum, Integer pageSize) { List authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); @@ -532,51 +581,14 @@ public class DecorationServiceImpl implements DecorationService { @Transactional(rollbackFor = Exception.class) @Override - public Boolean submitAcceptance(ThreeAcceptanceRequest request, PartnerUserInfoVO minUser, LoginUserInfo pcUser) { + public Boolean pcSubmitAcceptanceSign(ThreeAcceptanceRequest request) { log.info("submitAcceptance, request:{} ", JSONObject.toJSONString(request)); - if (Objects.nonNull(minUser)) { - try { - //插入检查项 - for (AssessmentDataDO assessmentDataDO : request.getAssessmentDataDOS()) { - //TODO 考核人是谁？ - assessmentDataDO.setAssessmentUserId(minUser.getPartnerId()); - } - Boolean assessment = assessmentDataService.batchInsert(request.getAssessmentDataDOS()); - if (assessment == Boolean.FALSE) { - log.error("三方验收插入检查项失败"); - throw new ServiceException(ErrorCodeEnum.CHECK_ITEM); - } - //工程部验收签名 - 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); - //加盟商 - 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); - AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); - acceptanceInfoDO.setShopId(request.getShopId()); - acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString()); - acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString()); - acceptanceInfoDO.setUpdateTime(new Date()); - acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); - //更新阶段状态验收中 - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); - return Boolean.TRUE; - } catch (Exception e) { - log.error("mini提交三方验收失败"); - throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE); - } - } else { - //营运部验收签名 - try { - AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(request.getShopId()); + //营运部验收签名 + try { + AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(request.getShopId()); + 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(); @@ -594,19 +606,54 @@ public class DecorationServiceImpl implements DecorationService { && AuditResultTypeEnum.PASS.getCode() == partner.getInteger("result") && AuditResultTypeEnum.PASS.getCode() == engineering.getInteger("result")) { //更新阶段状态验收完毕 - shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123,null); + shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123, null); preparationService.whetherToOpenForAcceptance(request.getShopId()); } else { //未通过至为带预约 shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120, null); } - } catch (Exception e) { - log.error("PC提交三方验收失败"); - throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE); } - + return Boolean.TRUE; + } catch (Exception e) { + log.error("PC提交三方验收失败"); + throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE); } - return Boolean.FALSE; + + } + + @Override + public List getThreeAcceptanceSign(Long shopId) { + List threeAcceptanceDTOS = new ArrayList<>(); + + AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId); + //工程部 + if (StringUtils.isNotEmpty(acceptanceInfoDO.getEngineeringAcceptanceSignatures())) { + JSONObject engineering = JSONObject.parseObject(acceptanceInfoDO.getEngineeringAcceptanceSignatures()); + ThreeAcceptanceDTO engineeringDTO = new ThreeAcceptanceDTO(); + engineeringDTO.setAcceptanceSignatures(engineering.getString("pic")); + engineeringDTO.setComments(engineering.getString("remark")); + engineeringDTO.setResultType(engineering.getInteger("result")); + threeAcceptanceDTOS.add(CommonConstants.ZERO, engineeringDTO); + } + //营运部 + if (StringUtils.isNotEmpty(acceptanceInfoDO.getOperationsAcceptanceSignatures())) { + JSONObject operations = JSONObject.parseObject(acceptanceInfoDO.getOperationsAcceptanceSignatures()); + ThreeAcceptanceDTO operationsDTO = new ThreeAcceptanceDTO(); + operationsDTO.setAcceptanceSignatures(operations.getString("pic")); + operationsDTO.setComments(operations.getString("remark")); + operationsDTO.setResultType(operations.getInteger("result")); + threeAcceptanceDTOS.add(CommonConstants.ONE, operationsDTO); + } + //加盟商 + if (StringUtils.isNotEmpty(acceptanceInfoDO.getPartnerAcceptanceSignatures())) { + JSONObject partner = JSONObject.parseObject(acceptanceInfoDO.getPartnerAcceptanceSignatures()); + ThreeAcceptanceDTO partnerDTO = new ThreeAcceptanceDTO(); + partnerDTO.setAcceptanceSignatures(partner.getString("pic")); + partnerDTO.setComments(partner.getString("remark")); + partnerDTO.setResultType(partner.getInteger("result")); + threeAcceptanceDTOS.add(CommonConstants.TWO, partnerDTO); + } + return threeAcceptanceDTOS; } @Override diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 4b01baecb..1155c6754 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -53,6 +53,7 @@ public class SignValidateFilter implements Filter { "/xfsg/favicon.ico", "/xfsg/v2/api-docs","/**/test/**", "/xfsg/mini/program/oss/getUploadFileConfig", + "/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo", "/**/swagger*/**", "/**/webjars/**", diff --git 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 index 48808f619..5a4a55967 100644 --- 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 @@ -82,6 +82,6 @@ public class PCDecorationController { @ApiOperation("提交三方验收") @PostMapping("/submitThreeAcceptance") public ResponseResult submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){ - return ResponseResult.success(decorationService.submitAcceptance(request,null, CurrentUserHolder.getUser())); + return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request)); } } diff --git 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 index 86d15d0fb..ef28e19f5 100644 --- 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 @@ -76,7 +76,7 @@ public class MiniDecorationController { PartnerUserInfoVO user = PartnerUserHolder.getUser(); return ResponseResult.success(decorationService.getDecorationModel(shopId,user)); } - @ApiOperation("获取三方验收检查项") + @ApiOperation("获取三方验收模板检查项") @GetMapping("/getChecks") public ResponseResult> getChecks(@RequestParam Integer type){ return ResponseResult.success(assessmentTemplateService.listByType(type)); @@ -86,11 +86,16 @@ public class MiniDecorationController { public ResponseResult submitThreeChecks(@RequestBody ThreeAcceptanceCheckRequest request){ return ResponseResult.success(decorationService.submitThreeCheck(request)); } - @ApiOperation("提交三方验收") - @PostMapping("/submitThreeAcceptance") + @ApiOperation("获取三方验收检查项") + @GetMapping("/getAcceptanceChecks") + public ResponseResult getAcceptanceChecks(@RequestParam Long shopId){ + return ResponseResult.success(decorationService.getThreeChecks(shopId)); + } + @ApiOperation("提交三方验收签字") + @PostMapping("/submitThreeAcceptanceSign") public ResponseResult submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){ - PartnerUserInfoVO user = PartnerUserHolder.getUser(); - return ResponseResult.success(decorationService.submitAcceptance(request,user,null)); + + return ResponseResult.success(decorationService.miniSubmitAcceptanceSign(request)); } @ApiOperation("查看三方验收") @GetMapping("/getThreeAcceptance")