fix 平台加购规格

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

@@ -10,7 +10,6 @@ import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.model.entity.GoodsDiscountPlusPurchaseRelation;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.manage.request.ReqGoodsSpuInsert;
@@ -66,17 +65,6 @@ public class CmsGoodsDonController {
         if (StrUtil.isNotBlank(goodsDonViewer.getRecommendGoods())) {
             goodsDonViewer.setRecommendGoodsList(Jsons.parseList(goodsDonViewer.getRecommendGoods(), Long.class));
         }
-        List<GoodsDonSku> goodsDonSkus = beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, id).build());
-        if (goodsDonViewer.getType() == 1) {
-            goodsDonSkus.forEach(sku -> {
-                if (sku.getIsDp()) {
-                    sku.setDpSku(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelation.class, MapUtils.builder()
-                            .field(GoodsDiscountPlusPurchaseRelation::getSkuId, sku.getId())
-                            .build()));
-                }
-            });
-        }
-        goodsDonViewer.setSkus(goodsDonSkus);
         return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonViewer);
     }
 

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

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.goods;
 
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.Log;
@@ -13,6 +12,7 @@ import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.manage.request.ReqGoodsSkuInsert;
 import com.cyksj.model.request.CombinationSkuReq;
+import com.cyksj.model.views.GoodsDiscountPlusPurchaseRelationFrontView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.mange.CmsGoodsDonService;
 import com.cyksj.service.mange.CmsGoodsDonSkuService;
@@ -183,6 +183,13 @@ public class CmsGoodsDonSkuController {
     @GetMapping("/get/list")
     public Result<SearchResult<GoodsDonSku>> getGoodsSkuList() {
         SearchResult<GoodsDonSku> skuViewList = beanSearcher.search(GoodsDonSku.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+        skuViewList.getDataList().forEach(sku->{
+            if (sku.getIsDp()) {
+                sku.setDpSkuViews(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelationFrontView.class, MapUtils.builder()
+                        .field(GoodsDiscountPlusPurchaseRelationFrontView::getSkuId, sku.getId())
+                        .build()));
+            }
+        });
         return GatewayResponse.SUCCESS.newBuilder().toResult(skuViewList);
     }