diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 460818b86..32b658e40 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -145,7 +145,7 @@ actual_complete_time = #{shopStageInfoDO.actualCompleteTime}, - where shop_id = #{shopStageInfoDO.shopId} + where shop_id = #{shopStageInfoDO.shopId} AND shop_sub_stage = #{shopStageInfoDO.shopSubStage} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java index e0397741e..d0cff1f47 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java @@ -22,11 +22,11 @@ public class DecorationStageVO { private Integer shopSubStageStatus; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creatTime; + private Date createDate; @ApiModelProperty("计划开始时间") - private String planBeginTime; + private String planBeginDate; @ApiModelProperty("计划结束时间") - private String planEndTime; + private String planEndTDate; @ApiModelProperty("实际完成时间") - private String actualEndTime; + private String actualEndDate; } 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 4b01bf28d..4d7ce89b7 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 @@ -52,7 +52,7 @@ public interface DecorationService { * @Date: 2024/4/28 * @description:提交装修款付款凭证 */ - String submitDecorationModel(LinePaySubmitRequest LinePaySubmitRequest, PartnerUserInfoVO partnerUserInfoVO); + Boolean submitDecorationModel(LinePaySubmitRequest LinePaySubmitRequest, PartnerUserInfoVO partnerUserInfoVO); /** * @Auther: wangshuo 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 20c778cdf..543f921e0 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 @@ -153,8 +153,13 @@ public class DecorationServiceImpl implements DecorationService { } DecorationStageVO decorationStageVO = new DecorationStageVO(); decorationStageVO.setShopSubStageStatus(shopSubStageInfo.getShopSubStageStatus()); - decorationStageVO.setPlanBeginTime(shopSubStageInfo.getPlanCompleteTime()); - decorationStageVO.setActualEndTime(shopSubStageInfo.getActualCompleteTime()); + decorationStageVO.setPlanEndTDate(shopSubStageInfo.getPlanCompleteTime()); + decorationStageVO.setActualEndDate(shopSubStageInfo.getActualCompleteTime()); + LinePayVO linePayInfo = linePayService. + getLinePayInfo(shopSubStageInfo.getLineId(), PayBusinessTypeEnum.DECORATION_MODEL.getCode(), shopId); + if (Objects.nonNull(linePayInfo)) { + decorationStageVO.setCreateDate(linePayInfo.getCreateTime()); + } return decorationStageVO; } @@ -193,7 +198,7 @@ public class DecorationServiceImpl implements DecorationService { @Transactional(rollbackFor = Exception.class) @Override - public String submitDecorationModel(LinePaySubmitRequest request, PartnerUserInfoVO partnerUserInfoVO) { + public Boolean submitDecorationModel(LinePaySubmitRequest request, PartnerUserInfoVO partnerUserInfoVO) { DecorationDTO decoration = getDecorationDTO(request.getShopId()); if (decoration == null) { log.error("拉取云立方接口获取数据为空"); @@ -208,8 +213,8 @@ public class DecorationServiceImpl implements DecorationService { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_101); } request.setPayBusinessType(PayBusinessTypeEnum.DECORATION_MODEL.getCode()); - Long payId = linePayService.submitPayInfo(request, partnerUserInfoVO); - return payId.toString(); + linePayService.submitPayInfo(request, partnerUserInfoVO); + return Boolean.TRUE; } @Override @@ -456,26 +461,23 @@ public class DecorationServiceImpl implements DecorationService { List lineInfos = lineInfoMapper.getByLineIds(lineIds); Map lineInfoDOMap = lineInfos.stream().collect(Collectors.toMap(LineInfoDO::getId, dto -> dto)); //招商name - List InvestmentManagerIds = lineInfos.stream().map(LineInfoDO::getInvestmentManager).collect(Collectors.toList()); - List nameByUserId = enterpriseUserDAO.getNameByUserId(InvestmentManagerIds); - Map vonameMap = nameByUserId.stream() - .collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo)); + List userIds = new ArrayList<>(); + userIds.addAll(lineInfos.stream().filter(o -> o.getInvestmentManager() != null) + .map(LineInfoDO::getInvestmentManager).distinct().collect(Collectors.toList())); //选址人员（拓展经理）name - List setterIds = lineInfos.stream().map(LineInfoDO::getDevelopmentManager).collect(Collectors.toList()); - List setterName = enterpriseUserDAO.getNameByUserId(setterIds); - Map setterNameMap = setterName.stream() - .collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo)); + userIds.addAll(lineInfos.stream().filter(o -> o.getDevelopmentManager() != null) + .map(LineInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList())); + Map userNameMap = enterpriseUserDAO.getUserNameMap(userIds); //所属战区 - List regionIds = shopInfoDOS.stream().map(ShopInfoDO::getRegionId).collect(Collectors.toList()); + List regionIds = shopInfoDOS.stream().filter(o -> o.getRegionId() != null). + map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList()); Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); //战区经理name Map fightManger = new HashMap<>(); for (Long regionId : regionIds) { String fightMangerUserId = sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, Arrays.asList(UserRoleEnum.THEATER_MANAGER)); - List fightMangerName = enterpriseUserDAO.getNameByUserId(Arrays.asList(fightMangerUserId)); - if (!fightMangerName.isEmpty()) { - fightManger.put(regionId, fightMangerName.get(CommonConstants.ZERO).getName()); - } + String userName = enterpriseUserDAO.getUserName(fightMangerUserId); + fightManger.put(regionId, userName); } //施工计划完成时间 //施工实际完成实际//验收状态//计划验收时间//验收实际时间 Map ShopStageInfoDOMap = new HashMap<>(); @@ -483,7 +485,6 @@ public class DecorationServiceImpl implements DecorationService { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_12); ShopStageInfoDOMap.put(shopId, shopSubStageInfo); } - for (ShopInfoDO shopInfoDO : shopInfoDOS) { fitmentCheckVO fitmentCheckVO = new fitmentCheckVO(); fitmentCheckVO.setShopId(shopInfoDO.getId()); @@ -492,15 +493,16 @@ public class DecorationServiceImpl implements DecorationService { fitmentCheckVO.setLineId(shopInfoDO.getLineId()); fitmentCheckVO.setRegionId(shopInfoDO.getRegionId()); fitmentCheckVO.setRegion(regionNameMap.get(shopInfoDO.getRegionId())); + fitmentCheckVO.setFightManager(fightManger.get(shopInfoDO.getRegionId())); if (shopInfoDO.getLineId() != null) { fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(shopInfoDO.getLineId()) .getInvestmentManager()); - fitmentCheckVO.setInvestmentManager(vonameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) - .getInvestmentManager()).getName()); + fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) + .getInvestmentManager())); fitmentCheckVO.setSitterId(lineInfoDOMap.get(shopInfoDO.getLineId()) .getDevelopmentManager()); - fitmentCheckVO.setSitterName(setterNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) - .getDevelopmentManager()).getName()); + fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) + .getDevelopmentManager())); fitmentCheckVO.setPartnerName(lineInfoDOMap.get(shopInfoDO.getLineId()).getUsername()); } if (shopInfoDO.getId() != null) { @@ -512,9 +514,8 @@ public class DecorationServiceImpl implements DecorationService { Date PlanAcceptanceTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime); fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopInfoDO.getId()).getShopSubStageStatus()); - } - } + } fitmentCheckVOList.add(fitmentCheckVO); } pageInfo.setList(fitmentCheckVOList); @@ -591,7 +592,9 @@ public class DecorationServiceImpl implements DecorationService { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121); ShopStageInfoDO newShopStageInfoDO = new ShopStageInfoDO(); + CoolDateUtils.parseDate(request.getBookingAcceptanceTime().toString(), CoolDateUtils.DATE_FORMAT_SEC); newShopStageInfoDO.setPlanCompleteTime(request.getBookingAcceptanceTime().toString()); + newShopStageInfoDO.setShopSubStage(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage()); newShopStageInfoDO.setShopId(request.getShopId()); shopStageInfoDAO.updateByShopId(newShopStageInfoDO); return Boolean.TRUE; 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 c1d3b391a..c1db3658b 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 @@ -65,9 +65,9 @@ public class PCDecorationController { } @ApiOperation("获取验收列表：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过") @GetMapping("/getAcceptanceList") - public ResponseResult> getAcceptanceList(@RequestParam Integer status, @RequestParam Integer pageNum,@RequestParam Integer pageSize){ + public ResponseResult> getAcceptanceList(@RequestParam Integer subStageStatus, @RequestParam Integer pageNum,@RequestParam Integer pageSize){ LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(decorationService.getFitmentAcceptanceList(status,user,pageNum,pageSize)); + return ResponseResult.success(decorationService.getFitmentAcceptanceList(subStageStatus,user,pageNum,pageSize)); } @ApiOperation("预约验收") @PostMapping("/bookingAcceptance") 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 a1f748e49..e54a4a4c8 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 @@ -54,7 +54,7 @@ public class MiniDecorationController { } @PostMapping("/submitDecorationModel") @ApiOperation("提交装修款") - public ResponseResult submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){ + public ResponseResult submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){ return ResponseResult.success(decorationService.submitDecorationModel(linePaySubmitRequest, PartnerUserHolder.getUser())); } @ApiOperation("获取装修款信息,和二维码")