fix 车位展示还原

netflix-service/src/main/java/com/cyksj/service/mange/CmsGoodsDonSkuService.java

@@ -8,5 +8,4 @@ import com.cyksj.model.entity.GoodsDonSku;
  * @date 2022/9/27 5:43 PM
  */
 public interface CmsGoodsDonSkuService extends IService<GoodsDonSku> {
-	Integer handleGroupsNum(Long skuId);
 }

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSkuServiceImpl.java

@@ -16,30 +16,4 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 @Service
 public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,GoodsDonSku> implements CmsGoodsDonSkuService {
-	@Override
-	public Integer handleGroupsNum(Long skuId) {
-		Integer num = null;
-		if (skuId.equals(161l)) {
-			num = 10;
-		}
-		if (skuId.equals(178l)) {
-			num = 4;
-		}
-		if (skuId.equals(189l)) {
-			num = 10;
-		}
-		if (skuId.equals(175l)) {
-			num = 10;
-		}
-		if (skuId.equals(185l)) {
-			num = 10;
-		}
-		if (skuId.equals(199l)) {
-			num = 10;
-		}
-		if (skuId.equals(200l)) {
-			num = 10;
-		}
-		return num;
-	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -13,7 +13,6 @@ import com.cyksj.model.manage.request.ReqGoodsSpuInsert;
 import com.cyksj.model.manage.views.GoodsDonViewer;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.mange.CmsGoodsDonService;
-import com.cyksj.service.mange.CmsGoodsDonSkuService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapUtils;
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * @author chan
@@ -45,8 +43,6 @@ public class CmsGoodsDonController {
 
     private final RedisService redisService;
 
-    private final CmsGoodsDonSkuService goodsDonSkuService;
-
     @GetMapping("/get")
     public Result<SearchResult<GoodsDon>> get(){
         SearchResult<GoodsDon> search = beanSearcher.search(GoodsDon.class, MapUtils.flatBuilder(request.getParameterMap())
@@ -62,12 +58,6 @@ public class CmsGoodsDonController {
     public Result<GoodsDonViewer> getById(@PathVariable Long id) {
         GoodsDonViewer goodsDonViewer = beanSearcher.searchFirst(GoodsDonViewer.class, MapUtils.builder().field(GoodsDonViewer::getId, id).build());
         List<GoodsDonSku> goodsDonSkus = beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, id).build());
-        if (id == 18 || id == 26) {
-            goodsDonSkus.forEach(sku -> {
-                Optional.ofNullable(goodsDonSkuService.handleGroupsNum(sku.getId()))
-                        .ifPresent(num -> sku.setNum(num));
-            });
-        }
         goodsDonViewer.setSkus(goodsDonSkus);
         return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonViewer);
     }

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupController.java

@@ -25,7 +25,6 @@ import com.cyksj.model.views.CloseGroupsTripsView;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.model.views.GroupsTripsWaitingView;
 import com.cyksj.service.mange.CmsAccountService;
-import com.cyksj.service.mange.CmsGoodsDonSkuService;
 import com.cyksj.service.mange.CmsGroupService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -62,9 +61,6 @@ public class CmsGroupController {
 
     private final GroupsRelationMapper relationMapper;
 
-    private final CmsGoodsDonSkuService goodsDonSkuService;
-
-
     @GetMapping("/get")
     @SaCheckPermission("group:view")
     public Result<SearchResult<GroupsTrips>> get(String account, Long userId, String nickName, String submitAccount, Boolean isEmpty) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -2,11 +2,8 @@ package com.cyksj.web.controller.manage.group;
 
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.mapper.GroupsMapper;
 import com.cyksj.model.entity.GroupsRelation;
-import com.cyksj.model.entity.GroupsTrips;
 import com.cyksj.model.manage.views.GroupsRelationView;
-import com.cyksj.service.mange.CmsGoodsDonSkuService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
@@ -33,23 +30,12 @@ public class CmsGroupRelationController {
 
     private final HttpServletRequest request;
 
-    private final GroupsMapper groupsMapper;
-
-    private final CmsGoodsDonSkuService goodsDonSkuService;
-
     @GetMapping("/get")
-    public Result<List<GroupsRelationView>> get(Long groupsId){
-        GroupsTrips groupsTrips = groupsMapper.selectById(groupsId);
-        Integer num = goodsDonSkuService.handleGroupsNum(groupsTrips.getSkuId());
-        if (num == null) {
-            num = groupsTrips.getNum();
-        }
+    public Result<List<GroupsRelationView>> get(){
         List<GroupsRelationView> search = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none.toString()).op(Operator.NotEqual)
-                .limit(0, num)
-                .build()
+                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none.toString()).op(Operator.NotEqual).build()
         );
-        return GatewayResponse.SUCCESS.newBuilder().toResult(search.subList(0, num));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 
-}
+}