From 64ddcfcbb969ac5947a71709379e2798daec48c8 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 7 May 2024 10:30:29 +0800
Subject: [PATCH] fix

---
 .../store/request/MiniAddPointRequest.java    |  4 ++++
 .../store/service/impl/PointServiceImpl.java  | 19 ++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java
index 79c24e154..3390f5f7d 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java
@@ -18,6 +18,10 @@ import java.util.Objects;
 @Data
 public class MiniAddPointRequest {
 
+    @NotNull
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
     @NotBlank
     @ApiModelProperty("铺位名称")
     private String pointName;
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 49efaea82..0a16caeea 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
@@ -789,10 +789,12 @@ public class PointServiceImpl implements PointService {
         if(Objects.isNull(lineInfo)){
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
         }
-        List<ShopInfoDO> shopList = shopInfoDAO.getShopList(lineId);
-        List<Long> unSelectShopIds = shopList.stream().filter(o -> o.getShopStage().equals(ShopStageEnum.SHOP_STAGE_1.getShopStage())).filter(o -> Objects.isNull(o.getPointId())).map(ShopInfoDO::getId).collect(Collectors.toList());
-        if(CollectionUtils.isEmpty(unSelectShopIds)){
-            throw new ServiceException(ErrorCodeEnum.NOT_EXIST_UNSELECT_POINT);
+        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
+        if(Objects.isNull(shopInfo)){
+            throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
+        }
+        if(Objects.nonNull(shopInfo.getPointId())){
+            throw new ServiceException(ErrorCodeEnum.SHOP_IS_SELECTED);
         }
         PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request);
         PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request);
@@ -806,15 +808,6 @@ public class PointServiceImpl implements PointService {
         Long pointId = pointInfoDAO.addPointInfo(pointInfo);
         pointDetailInfo.setPointId(pointId);
         pointDetailInfoDAO.addPointDetailInfo(pointDetailInfo);
-        //门店占铺
-        Integer result = shopInfoDAO.occupyShopPoint(unSelectShopIds, pointId);
-        if(result != CommonConstants.ONE){
-            throw new ServiceException(ErrorCodeEnum.SELECT_POINT_ERROR);
-        }
-        ShopInfoDO shopInfo = shopInfoDAO.getShopInfoByPointId(lineId, pointId);
-        if(Objects.isNull(shopInfo)){
-            throw new ServiceException(ErrorCodeEnum.SELECT_POINT_ERROR);
-        }
         shopInfo.setShopName(pointInfo.getPointName());
         shopInfoDAO.updateShopInfo(shopInfo);
         PointRecommendDO pointRecommendDO = new PointRecommendDO();