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 76a69aaf0..2cd0791eb 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 @@ -446,25 +446,33 @@ public class DecorationServiceImpl implements DecorationService { 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); + 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); + AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setShopId(request.getShopId()); + acceptanceInfoDO.setPartnerAcceptanceSignatures(engineering.toString()); + acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); + } //加盟商 - 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); + 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); + AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setShopId(request.getShopId()); + acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString()); + acceptanceInfoDO.setUpdateTime(new Date()); + acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO); + } //更新阶段状态验收中 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122); return Boolean.TRUE; @@ -672,7 +680,6 @@ public class DecorationServiceImpl implements DecorationService { } - private DecorationDTO getDecorationDTO(Long shopId) { List shopIds = new ArrayList<>(); shopIds.add(shopId);