fix 处理后台车位展示

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

@@ -1,16 +1,12 @@
 package com.cyksj.service.mange;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.model.entity.GoodsDonSku;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
 
 /**
  * @author chan
  * @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,4 +16,30 @@ 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(16l)) {
+			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,6 +13,7 @@ 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;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author chan
@@ -43,6 +45,8 @@ 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())
@@ -55,9 +59,15 @@ public class CmsGoodsDonController {
      * 商品详情
      */
     @GetMapping("/get/{id}")
-    public Result<GoodsDonViewer> getById(@PathVariable Long id){
+    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,6 +25,7 @@ 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;
@@ -61,6 +62,8 @@ public class CmsGroupController {
 
     private final GroupsRelationMapper relationMapper;
 
+    private final CmsGoodsDonSkuService goodsDonSkuService;
+
 
     @GetMapping("/get")
     @SaCheckPermission("group:view")

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

@@ -2,10 +2,12 @@ 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.SearchResult;
 import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
@@ -31,12 +33,23 @@ public class CmsGroupRelationController {
 
     private final HttpServletRequest request;
 
+    private final GroupsMapper groupsMapper;
+
+    private final CmsGoodsDonSkuService goodsDonSkuService;
+
     @GetMapping("/get")
-    public Result<List<GroupsRelationView>> 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();
+        }
         List<GroupsRelationView> search = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none.toString()).op(Operator.NotEqual).build()
+                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none.toString()).op(Operator.NotEqual)
+                .limit(0, num)
+                .build()
         );
-        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(search.subList(0, num));
     }
 
 }