Merge branch 'mj_upgrade' into pre

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

@@ -1261,14 +1261,6 @@ public class GoodsDonController {
 			build.put("sku", String.format(" and JSON_CONTAINS(up.sku_id,'\"%s\"')", skuId));
 		}
 		SearchResult<UpgradePackageView> search = beanSearcher.search(UpgradePackageView.class, build);
-		search.getDataList().forEach(upgradePackageView -> {
-            try {
-				String specVal = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class).in(GoodsDonSku::getId, Jsons.parseList(upgradePackageView.getSkuId(), Long.class))).stream().map(GoodsDonSku::getSpecVal).collect(Collectors.joining(","));
-				upgradePackageView.setSpecVal(specVal);
-			} catch (Exception e) {
-                throw BusinessRuntimeException.getInstance("获取套餐规格失败");
-            }
-        });
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/upgrade/UpgradePackageController.java

@@ -2,11 +2,15 @@ package com.cyksj.web.controller.manage.upgrade;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.GoodsDonSkuMapper;
+import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.entity.UpgradePackage;
 import com.cyksj.model.views.UpgradePackageView;
 import com.cyksj.service.mange.upgrade.UpgradePackageService;
@@ -20,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -38,6 +43,8 @@ public class UpgradePackageController {
 
     private final BeanSearcher beanSearcher;
 
+    private final GoodsDonSkuMapper goodsDonSkuMapper;
+
     /**
      * 新增套餐
      */
@@ -117,6 +124,14 @@ public class UpgradePackageController {
             build.put("sku", String.format(" and JSON_CONTAINS(up.sku_id,'\"%s\"')", skuId));
         }
         SearchResult<UpgradePackageView> search = beanSearcher.search(UpgradePackageView.class, build);
+        search.getDataList().forEach(upgradePackageView -> {
+            try {
+                String specVal = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class).in(GoodsDonSku::getId, Jsons.parseList(upgradePackageView.getSkuId(), Long.class))).stream().map(GoodsDonSku::getSpecVal).collect(Collectors.joining(","));
+                upgradePackageView.setSpecVal(specVal);
+            } catch (Exception e) {
+                throw BusinessRuntimeException.getInstance("获取套餐规格失败");
+            }
+        });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }