suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成部分TODO修改bug

Browse Source
This commit is contained in:
shuo.wang
2024-05-09 16:49:52 +08:00
parent d80d1e4b3c
commit fc9d1446a5
6 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -145,7 +145,7 @@
actual_complete_time = #{shopStageInfoDO.actualCompleteTime}, actual_complete_time = #{shopStageInfoDO.actualCompleteTime},
</if> </if>
</set> </set>
where shop_id = #{shopStageInfoDO.shopId} where shop_id = #{shopStageInfoDO.shopId} AND shop_sub_stage = #{shopStageInfoDO.shopSubStage}
</update> </update>

8
coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java
View File

@@ -22,11 +22,11 @@ public class DecorationStageVO {
private Integer shopSubStageStatus; private Integer shopSubStageStatus;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date creatTime; private Date createDate;
@ApiModelProperty("计划开始时间") @ApiModelProperty("计划开始时间")
private String planBeginTime; private String planBeginDate;
@ApiModelProperty("计划结束时间") @ApiModelProperty("计划结束时间")
private String planEndTime; private String planEndTDate;
@ApiModelProperty("实际完成时间") @ApiModelProperty("实际完成时间")
private String actualEndTime; private String actualEndDate;
} }

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

@@ -52,7 +52,7 @@ public interface DecorationService {
* @Date: 2024/4/28 * @Date: 2024/4/28
* @description:提交装修款付款凭证 * @description:提交装修款付款凭证
*/ */
String submitDecorationModel(LinePaySubmitRequest LinePaySubmitRequest, PartnerUserInfoVO partnerUserInfoVO); Boolean submitDecorationModel(LinePaySubmitRequest LinePaySubmitRequest, PartnerUserInfoVO partnerUserInfoVO);
/** /**
* @Auther: wangshuo * @Auther: wangshuo

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

@@ -153,8 +153,13 @@ public class DecorationServiceImpl implements DecorationService {
} }
DecorationStageVO decorationStageVO = new DecorationStageVO(); DecorationStageVO decorationStageVO = new DecorationStageVO();
decorationStageVO.setShopSubStageStatus(shopSubStageInfo.getShopSubStageStatus()); decorationStageVO.setShopSubStageStatus(shopSubStageInfo.getShopSubStageStatus());
decorationStageVO.setPlanBeginTime(shopSubStageInfo.getPlanCompleteTime()); decorationStageVO.setPlanEndTDate(shopSubStageInfo.getPlanCompleteTime());
decorationStageVO.setActualEndTime(shopSubStageInfo.getActualCompleteTime()); 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; return decorationStageVO;
} }
@@ -193,7 +198,7 @@ public class DecorationServiceImpl implements DecorationService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public String submitDecorationModel(LinePaySubmitRequest request, PartnerUserInfoVO partnerUserInfoVO) { public Boolean submitDecorationModel(LinePaySubmitRequest request, PartnerUserInfoVO partnerUserInfoVO) {
DecorationDTO decoration = getDecorationDTO(request.getShopId()); DecorationDTO decoration = getDecorationDTO(request.getShopId());
if (decoration == null) { if (decoration == null) {
log.error("拉取云立方接口获取数据为空"); log.error("拉取云立方接口获取数据为空");
@@ -208,8 +213,8 @@ public class DecorationServiceImpl implements DecorationService {
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_101); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_101);
} }
request.setPayBusinessType(PayBusinessTypeEnum.DECORATION_MODEL.getCode()); request.setPayBusinessType(PayBusinessTypeEnum.DECORATION_MODEL.getCode());
Long payId = linePayService.submitPayInfo(request, partnerUserInfoVO); linePayService.submitPayInfo(request, partnerUserInfoVO);
return payId.toString(); return Boolean.TRUE;
} }
@Override @Override
@@ -456,26 +461,23 @@ public class DecorationServiceImpl implements DecorationService {
List<LineInfoDO> lineInfos = lineInfoMapper.getByLineIds(lineIds); List<LineInfoDO> lineInfos = lineInfoMapper.getByLineIds(lineIds);
Map<Long, LineInfoDO> lineInfoDOMap = lineInfos.stream().collect(Collectors.toMap(LineInfoDO::getId, dto -> dto)); Map<Long, LineInfoDO> lineInfoDOMap = lineInfos.stream().collect(Collectors.toMap(LineInfoDO::getId, dto -> dto));
//招商name //招商name
List<String> InvestmentManagerIds = lineInfos.stream().map(LineInfoDO::getInvestmentManager).collect(Collectors.toList()); List<String> userIds = new ArrayList<>();
List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(InvestmentManagerIds); userIds.addAll(lineInfos.stream().filter(o -> o.getInvestmentManager() != null)
Map<String, UserNameDTO> vonameMap = nameByUserId.stream() .map(LineInfoDO::getInvestmentManager).distinct().collect(Collectors.toList()));
.collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo));
//选址人员（拓展经理）name //选址人员（拓展经理）name
List<String> setterIds = lineInfos.stream().map(LineInfoDO::getDevelopmentManager).collect(Collectors.toList()); userIds.addAll(lineInfos.stream().filter(o -> o.getDevelopmentManager() != null)
List<UserNameDTO> setterName = enterpriseUserDAO.getNameByUserId(setterIds); .map(LineInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()));
Map<String, UserNameDTO> setterNameMap = setterName.stream() Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(userIds);
.collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo));
//所属战区 //所属战区
List<Long> regionIds = shopInfoDOS.stream().map(ShopInfoDO::getRegionId).collect(Collectors.toList()); List<Long> regionIds = shopInfoDOS.stream().filter(o -> o.getRegionId() != null).
map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList());
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
//战区经理name //战区经理name
Map<Long, String> fightManger = new HashMap<>(); Map<Long, String> fightManger = new HashMap<>();
for (Long regionId : regionIds) { for (Long regionId : regionIds) {
String fightMangerUserId = sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, Arrays.asList(UserRoleEnum.THEATER_MANAGER)); String fightMangerUserId = sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, Arrays.asList(UserRoleEnum.THEATER_MANAGER));
List<UserNameDTO> fightMangerName = enterpriseUserDAO.getNameByUserId(Arrays.asList(fightMangerUserId)); String userName = enterpriseUserDAO.getUserName(fightMangerUserId);
if (!fightMangerName.isEmpty()) { fightManger.put(regionId, userName);
fightManger.put(regionId, fightMangerName.get(CommonConstants.ZERO).getName());
}
} }
//施工计划完成时间 //施工实际完成实际//验收状态//计划验收时间//验收实际时间 //施工计划完成时间 //施工实际完成实际//验收状态//计划验收时间//验收实际时间
Map<Long, ShopStageInfoDO> ShopStageInfoDOMap = new HashMap<>(); Map<Long, ShopStageInfoDO> ShopStageInfoDOMap = new HashMap<>();
@@ -483,7 +485,6 @@ public class DecorationServiceImpl implements DecorationService {
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_12); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_12);
ShopStageInfoDOMap.put(shopId, shopSubStageInfo); ShopStageInfoDOMap.put(shopId, shopSubStageInfo);
} }
for (ShopInfoDO shopInfoDO : shopInfoDOS) { for (ShopInfoDO shopInfoDO : shopInfoDOS) {
fitmentCheckVO fitmentCheckVO = new fitmentCheckVO(); fitmentCheckVO fitmentCheckVO = new fitmentCheckVO();
fitmentCheckVO.setShopId(shopInfoDO.getId()); fitmentCheckVO.setShopId(shopInfoDO.getId());
@@ -492,15 +493,16 @@ public class DecorationServiceImpl implements DecorationService {
fitmentCheckVO.setLineId(shopInfoDO.getLineId()); fitmentCheckVO.setLineId(shopInfoDO.getLineId());
fitmentCheckVO.setRegionId(shopInfoDO.getRegionId()); fitmentCheckVO.setRegionId(shopInfoDO.getRegionId());
fitmentCheckVO.setRegion(regionNameMap.get(shopInfoDO.getRegionId())); fitmentCheckVO.setRegion(regionNameMap.get(shopInfoDO.getRegionId()));
fitmentCheckVO.setFightManager(fightManger.get(shopInfoDO.getRegionId()));
if (shopInfoDO.getLineId() != null) { if (shopInfoDO.getLineId() != null) {
fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(shopInfoDO.getLineId()) fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(shopInfoDO.getLineId())
.getInvestmentManager()); .getInvestmentManager());
fitmentCheckVO.setInvestmentManager(vonameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId())
.getInvestmentManager()).getName()); .getInvestmentManager()));
fitmentCheckVO.setSitterId(lineInfoDOMap.get(shopInfoDO.getLineId()) fitmentCheckVO.setSitterId(lineInfoDOMap.get(shopInfoDO.getLineId())
.getDevelopmentManager()); .getDevelopmentManager());
fitmentCheckVO.setSitterName(setterNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId()) fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(shopInfoDO.getLineId())
.getDevelopmentManager()).getName()); .getDevelopmentManager()));
fitmentCheckVO.setPartnerName(lineInfoDOMap.get(shopInfoDO.getLineId()).getUsername()); fitmentCheckVO.setPartnerName(lineInfoDOMap.get(shopInfoDO.getLineId()).getUsername());
} }
if (shopInfoDO.getId() != null) { 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); Date PlanAcceptanceTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY);
fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime); fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime);
fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopInfoDO.getId()).getShopSubStageStatus()); fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopInfoDO.getId()).getShopSubStageStatus());
} }
} }
fitmentCheckVOList.add(fitmentCheckVO); fitmentCheckVOList.add(fitmentCheckVO);
} }
pageInfo.setList(fitmentCheckVOList); pageInfo.setList(fitmentCheckVOList);
@@ -591,7 +592,9 @@ public class DecorationServiceImpl implements DecorationService {
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121);
ShopStageInfoDO newShopStageInfoDO = new ShopStageInfoDO(); ShopStageInfoDO newShopStageInfoDO = new ShopStageInfoDO();
CoolDateUtils.parseDate(request.getBookingAcceptanceTime().toString(), CoolDateUtils.DATE_FORMAT_SEC);
newShopStageInfoDO.setPlanCompleteTime(request.getBookingAcceptanceTime().toString()); newShopStageInfoDO.setPlanCompleteTime(request.getBookingAcceptanceTime().toString());
newShopStageInfoDO.setShopSubStage(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage());
newShopStageInfoDO.setShopId(request.getShopId()); newShopStageInfoDO.setShopId(request.getShopId());
shopStageInfoDAO.updateByShopId(newShopStageInfoDO); shopStageInfoDAO.updateByShopId(newShopStageInfoDO);
return Boolean.TRUE; return Boolean.TRUE;

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

@@ -65,9 +65,9 @@ public class PCDecorationController {
} }
@ApiOperation("获取验收列表：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过") @ApiOperation("获取验收列表：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过")
@GetMapping("/getAcceptanceList") @GetMapping("/getAcceptanceList")
public ResponseResult<PageInfo<fitmentCheckVO>> getAcceptanceList(@RequestParam Integer status, @RequestParam Integer pageNum,@RequestParam Integer pageSize){ public ResponseResult<PageInfo<fitmentCheckVO>> getAcceptanceList(@RequestParam Integer subStageStatus, @RequestParam Integer pageNum,@RequestParam Integer pageSize){
LoginUserInfo user = CurrentUserHolder.getUser(); LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.getFitmentAcceptanceList(status,user,pageNum,pageSize)); return ResponseResult.success(decorationService.getFitmentAcceptanceList(subStageStatus,user,pageNum,pageSize));
} }
@ApiOperation("预约验收") @ApiOperation("预约验收")
@PostMapping("/bookingAcceptance") @PostMapping("/bookingAcceptance")

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

@@ -54,7 +54,7 @@ public class MiniDecorationController {
} }
@PostMapping("/submitDecorationModel") @PostMapping("/submitDecorationModel")
@ApiOperation("提交装修款") @ApiOperation("提交装修款")
public ResponseResult submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){ public ResponseResult<Boolean> submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){
return ResponseResult.success(decorationService.submitDecorationModel(linePaySubmitRequest, PartnerUserHolder.getUser())); return ResponseResult.success(decorationService.submitDecorationModel(linePaySubmitRequest, PartnerUserHolder.getUser()));
} }
@ApiOperation("获取装修款信息,和二维码") @ApiOperation("获取装修款信息,和二维码")