diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index b49300433..7ac5e4a2b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -258,6 +258,7 @@ public enum ErrorCodeEnum { BANK_EXIST(151007,"当前银行已存在，请直接选择！",null), EXPORT_LIMIT_5000(151008,"导出数据不能超过5000条，请增加筛选条件，减少导出数量",null), REGION_INTERSECTION_IS_NULL(151011,"所选所属大区/分公司，不在所选集团下",null), + CHECK_PAYER_ERROR(151012,"缴费人必须是签约人,请重新填写！",null), ; diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 73e9901dc..ae1833483 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -353,7 +353,7 @@ #{code} - + order by update_time desc diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java index 48deb803d..54d08d99e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java @@ -16,6 +16,8 @@ public class MiniShopsResponse { private String shopName; @ApiModelProperty("店铺编码") private String shopCode; + @ApiModelProperty("云流水编码") + private String ylsCode; @ApiModelProperty("店铺详细地址") private String detailAddress; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java index 7527bb988..f8493d904 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java @@ -3,6 +3,7 @@ package com.cool.store.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -45,6 +46,7 @@ public class BaseInfoVO { @ApiModelProperty("加盟模式") private Integer joinMode; + public BaseInfoVO(){} /** * 写一个构造方法 参数是BaseInfoVO diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java index 7779e9c47..845181f41 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java @@ -20,6 +20,8 @@ public class IntendPendingVO extends BaseInfoVO { @ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式") private Integer joinMode; + private Date updateTime; + public IntendPendingVO(){} public IntendPendingVO(BaseInfoVO baseInfoVO) { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java index 512be35dc..50b0508cf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java @@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author suzhuhong * @Date 2024/4/1 16:37 @@ -14,7 +16,7 @@ public class PayStagePendingVO extends BaseInfoVO { @ApiModelProperty("缴费时间 2024年04月23日 16:00") private String payTime; - + private Date updateTime; public PayStagePendingVO(){}; public PayStagePendingVO(BaseInfoVO baseInfoVO) { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java index d3c9bbf0c..110dc8636 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java @@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author suzhuhong * @Date 2024/4/1 16:55 @@ -14,6 +16,7 @@ public class SigningPendingVO extends BaseInfoVO { @ApiModelProperty("提交时间 2024年04月23日 16:00") private String submitTime; + private Date updateTime; public SigningPendingVO(){}; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index a685349f2..b15632c69 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -107,6 +107,7 @@ public class DeskServiceImpl implements DeskService { IntendPendingVO intendPendingVO = new IntendPendingVO(baseInfoVO); intendPendingVO.setJoinTime(new Date()); intendPendingVO.setJoinMode(x.getJoinMode()); + intendPendingVO.setUpdateTime(x.getUpdateTime()); list.add(intendPendingVO); }); @@ -133,7 +134,7 @@ public class DeskServiceImpl implements DeskService { if (linePayDO != null && linePayDO.getPayTime() != null) { payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime())); } - + payStagePendingVO.setUpdateTime(x.getUpdateTime()); list.add(payStagePendingVO); }); @@ -161,6 +162,7 @@ public class DeskServiceImpl implements DeskService { if (date != null) { signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); } + signingPendingVO.setUpdateTime(x.getUpdateTime()); list.add(signingPendingVO); }); page.setList(list); @@ -197,6 +199,7 @@ public class DeskServiceImpl implements DeskService { baseInfoVO.setUserPortraitList(labelBaseInfoList); baseInfoVO.setJoinMode(lineInfoDO.getJoinMode()); baseInfoVO.setWantShopAreaName(wantShopAreaMap.get(lineInfoDO.getWantShopAreaId())); + return baseInfoVO; } @@ -252,16 +255,6 @@ public class DeskServiceImpl implements DeskService { subStageStatusList, Boolean.TRUE); } } - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map shopPayDoMap = linePayDAO.getLinePayByShopIds(shopIds, PayBusinessTypeEnum.FRANCHISE_FEE.getCode()); - for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime())); - } - pageInfo.setList(list); return pageInfo; } @@ -269,19 +262,6 @@ public class DeskServiceImpl implements DeskService { public PageInfo signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_8, Arrays.asList(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus()), Boolean.TRUE); - - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()); - doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); - } - pageInfo.setList(list); return pageInfo; } @@ -306,91 +286,32 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23, + return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); - doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo : list) { - if (deskStageMap.get(vo.getShopId()) != null) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); - } - } - pageInfo.setList(list); - return pageInfo; } @Override public PageInfo posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16, + return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); - doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo : list) { - if (deskStageMap.get(vo.getShopId()) != null) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); - } - } - pageInfo.setList(list); - return pageInfo; } @Override public PageInfo tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24, + return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); - doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo : list) { - if (deskStageMap.get(vo.getShopId()) != null) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); - } - } - pageInfo.setList(list); - return pageInfo; } @Override public PageInfo orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17, + return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); - doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo : list) { - if (deskStageMap.get(vo.getShopId()) != null) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); - } - } - pageInfo.setList(list); - return pageInfo; + } @Override @@ -467,67 +388,17 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11, + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().filter(o -> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List shopIds1 = list.stream().filter(o -> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - List subStageList = shopStageInfoDAO.getSubStages(shopIds1, ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); - doThing(deskStageMap, subStageList); - //施工待提交阶段提交的表单用作施工中的提交时间 - Map constructionMap = new HashMap<>(); - List byIds = decorationDesignInfoDAO.getByIds(shopIds); - if (byIds != null) { - constructionMap = byIds.stream().collect(Collectors.toMap(DecorationDesignInfoDO::getShopId, DecorationDesignInfoDO::getConstructionCreateTime)); - } - for (PreparationCommonPendingVO vo : list) { - if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()) && deskStageMap.get(vo.getShopId()) != null) { - if (deskStageMap.get(vo.getShopId()) != null) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); - } - } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { - vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, constructionMap.get(vo.getShopId()))); - } - - } - pageInfo.setList(list); - return pageInfo; } @Override public PageInfo fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12, + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE); - List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)) { - return pageInfo; - } - List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map> deskStageMap = new HashMap<>(); - List acceptanceInfoDOList = acceptanceInfoDAO.selectByShopIds(shopIds); - for (AcceptanceInfoDO acceptanceInfoDO : acceptanceInfoDOList) { - DeskStageDTO dto = new DeskStageDTO(); - dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, acceptanceInfoDO.getCreateTime())); - dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()); - deskStageMap.put(acceptanceInfoDO.getShopId(), Collections.singletonList(dto)); - } - for (PreparationCommonPendingVO vo : list) { - for (DeskStageDTO deskStageDTO : deskStageMap.get(vo.getShopId())) { - if (vo.getSubStageStatus().equals(deskStageDTO.getShopSubStageStatus())) { - vo.setSubmitTime(deskStageDTO.getActualCompleteTime()); - break; - } - } - } - pageInfo.setList(list); - return pageInfo; } @Override @@ -637,7 +508,6 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setPartnerPhone(lineInfoDO.getMobile()); preparationCommonPendingVO.setRegionNodeName(regionNameMap.getOrDefault(preparationCommonPendingVO.getRegionId(), "")); preparationCommonPendingVO.setInvestmentManager(userNameMap.getOrDefault(preparationCommonPendingVO.getInvestmentManager(), "")); - preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, preparationCommonPendingVO.getUpdateTime())); } return new PageInfo<>(list); } @@ -733,6 +603,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setPartnerPhone(planLineDTO.getMobile()); preparationCommonPendingVO.setShopManagerUserName(userNameMap.getOrDefault(shopInfoDO.getShopManagerUserId(), "")); preparationCommonPendingVO.setRegionNodeName(regionNameMap.getOrDefault(shopInfoDO.getRegionId(), "")); + preparationCommonPendingVO.setUpdateTime(x.getUpdateTime()); list.add(preparationCommonPendingVO); }); result.setList(list); @@ -803,6 +674,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setSubStage(x.getShopSubStage()); preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus()); preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, x.getCreateTime())); + preparationCommonPendingVO.setUpdateTime(x.getUpdateTime()); preparationCommonPendingVO.setStoreName(shopInfoDO.getShopName()); PlanLineDTO planLineDTO = lineMap.getOrDefault(shopInfoDO.getLineId(), new PlanLineDTO()); preparationCommonPendingVO.setPartnerName(planLineDTO.getUsername()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 49aaa5eb3..46f3ba957 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -143,6 +143,10 @@ public class LinePayServiceImpl implements LinePayService { if (request.getLineId() != null) { lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); } + //缴纳加盟费检验缴费人必须是签约人 + if(PayBusinessTypeEnum.FRANCHISE_FEE.getCode().equals(request.getPayBusinessType()) && !lineInfo.getUsername().trim().equals(request.getPayUserName().trim())){ + throw new ServiceException(ErrorCodeEnum.CHECK_PAYER_ERROR); + } LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(request.getLineId(), request.getPayBusinessType(), request.getShopId()); linePayDO = checkAndFill(linePayDO, request, partnerUser); Long payId = linePayDO.getId(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 2bf8ebd0d..eb3bebe31 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -589,7 +589,21 @@ public class ShopServiceImpl implements ShopService { @Override public List getShopListSuccessOpen(Long lineId) { - return shopInfoDAO.getShopListSuccessOpen(eid, lineId); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); + List storeDOS = storeDao.listByMobile(lineInfoDO.getMobile()); + if (CollectionUtils.isEmpty(storeDOS)){ + return new ArrayList<>(); + } + List responses = new ArrayList<>(); + for (StoreDO storeDO : storeDOS){ + MiniShopsResponse response = new MiniShopsResponse(); + response.setShopName(storeDO.getStoreName()); + response.setShopCode(storeDO.getStoreNum()); + response.setYlsCode("ZXA8_"+storeDO.getStoreNum()); + response.setDetailAddress(storeDO.getStoreAddress()); + responses.add(response); + } + return responses; } @Override @@ -841,7 +855,7 @@ public class ShopServiceImpl implements ShopService { /** * 获取招商经理信息 - * @param lineInfo + * @param * @return */ private List getUserFromInvestmentManager(String userId) {