From 408363182efb3bb6b59876e73beadb1661c30a9e Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 16:26:29 +0800 Subject: [PATCH 1/3] fix --- .../main/java/com/cool/store/service/impl/PointServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index b46d40754..2450092f4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -703,6 +703,7 @@ public class PointServiceImpl implements PointService { pointInfoDAO.updatePointInfo(updatePoint); ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(shopId); + updateShop.setShopName(pointInfo.getPointName()); updateShop.setPointId(pointId); shopInfoDAO.updateShopInfo(updateShop); shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11); From bfd467f1dffc2a6eddc55c3174edb2641292c075 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 16:30:53 +0800 Subject: [PATCH 2/3] fix --- .../main/java/com/cool/store/vo/point/PointAuditRecordVO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java index 6318470d5..891969462 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java @@ -52,6 +52,9 @@ public class PointAuditRecordVO { @ApiModelProperty("是否超时") private Boolean isTimeout; + @ApiModelProperty("节点") + private Integer nodeNo; + public static List convert(List auditRecordList, Map userMap) { List resultList = new ArrayList<>(); for (PointAuditRecordDO pointAuditRecord : auditRecordList) { @@ -63,6 +66,7 @@ public class PointAuditRecordVO { pointAuditRecordVO.setSignAddress(pointAuditRecord.getSignAddress()); pointAuditRecordVO.setPictureUrl(pointAuditRecord.getPictureUrl()); pointAuditRecordVO.setIsTimeout(Boolean.FALSE); + pointAuditRecordVO.setNodeNo(pointAuditRecord.getNodeNo()); if(Objects.nonNull(pointAuditRecord.getReceiveTaskTime())){ Date time = Objects.isNull(pointAuditRecord.getFinishTaskTime()) ? new Date() : pointAuditRecord.getFinishTaskTime(); LocalDateTime localDateTime = LocalDateTime.ofInstant(pointAuditRecord.getReceiveTaskTime().toInstant(), ZoneId.systemDefault()); From 1f248a55e6e89f8c5d61b027742ddcdc649e0910 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 17:10:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=89=E5=9D=80=E6=95=B0=E9=87=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/ShopInfoDAO.java | 12 ++++++++++++ .../java/com/cool/store/mapper/ShopInfoMapper.java | 3 +++ .../src/main/resources/mapper/PointInfoMapper.xml | 2 +- .../src/main/resources/mapper/ShopInfoMapper.xml | 12 ++++++++++++ .../cool/store/service/impl/PointServiceImpl.java | 12 +++++++----- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 5c67f455f..3200a5d80 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -2,6 +2,7 @@ package com.cool.store.dao; import com.cool.store.constants.CommonConstants; import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO; +import com.cool.store.dto.point.LineCountDTO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; @@ -9,6 +10,7 @@ import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.vo.shop.StageShopCountVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; @@ -16,7 +18,9 @@ import org.springframework.stereotype.Repository; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * @author zhangchenbiao @@ -139,4 +143,12 @@ public class ShopInfoDAO { PageHelper.startPage(pageNum, pageSize); return shopInfoMapper.getOpenPlanShopListByShopName(shopName,bigName,fightName); } + + public Map getSelectedShopNumMap(List lineIds) { + if(CollectionUtils.isEmpty(lineIds)){ + return Maps.newHashMap(); + } + List selectedShopNum = shopInfoMapper.getSelectedShopNum(lineIds); + return selectedShopNum.stream().collect(Collectors.toMap(k->k.getLineId(), v->v.getSelectedShopNum())); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index 0337aa62f..2e8faf3fa 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO; +import com.cool.store.dto.point.LineCountDTO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.vo.shop.StageShopCountVO; import com.github.pagehelper.Page; @@ -69,4 +70,6 @@ public interface ShopInfoMapper extends Mapper { */ Page getOpenPlanShopListByShopName(@Param("shopName") String shopName, @Param("bigName") String bigName, @Param("fightName") String fightName); + + List getSelectedShopNum(@Param("lineIds") List lineIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index d14aefd4c..b05900717 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -106,7 +106,7 @@ line_id as lineId, count(1) as selectedShopNum from xfsg_point_info - where deleted = 0 and select_status = 1 and line_id in + where deleted = 0 and select_status = 1 and point_status !=7 and line_id in #{lineId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 0de17677b..0bfd355fd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -93,5 +93,17 @@ + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 2450092f4..75c302826 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -168,7 +168,7 @@ public class PointServiceImpl implements PointService { updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_7.getCode()); pointInfoDAO.updatePointInfo(updatePoint); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ - rollbackSelectPoint(pointInfo.getShopId()); + rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId()); } return pointRecommendDAO.updateRecommendStatus(pointId, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6, null); } @@ -177,8 +177,11 @@ public class PointServiceImpl implements PointService { * 回退选址状态 * @return */ - private void rollbackSelectPoint(Long shopId){ + private void rollbackSelectPoint(Long shopId, Long pointId){ + //店铺回退待带选址 shopInfoDAO.unbindPoint(shopId); + //铺位回退 + pointInfoDAO.recyclePoint(pointId); //回到待选址状态 shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10); //租赁合同回到未开始 @@ -200,9 +203,8 @@ public class PointServiceImpl implements PointService { if(PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())){ throw new ServiceException(ErrorCodeEnum.POINT_SIGNED); } - pointInfoDAO.recyclePoint(pointId); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ - rollbackSelectPoint(pointInfo.getShopId()); + rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId()); } //将已选择、已被他人选择的状态更新成待选泽 return pointRecommendDAO.updateRecommendStatusByStatusAndPointId(pointId, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1, Arrays.asList(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3)); @@ -435,7 +437,7 @@ public class PointServiceImpl implements PointService { List wantShopAreaIds = lineList.stream().map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); Map recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(lineIds); Map cityMap = hyOpenAreaInfoDAO.getCityMap(wantShopAreaIds); - Map selectedShopNumMap = pointInfoDAO.getSelectedShopNumMap(lineIds); + Map selectedShopNumMap = shopInfoDAO.getSelectedShopNumMap(lineIds); Map userNameMap = enterpriseUserDAO.getUserNameMap(investmentManagerUserIds); Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); List resultList = LinePointBaseInfoVO.convertList(lineList, userNameMap, userPortraitMap, cityMap, recommendShopNumMap, selectedShopNumMap);