Merge branch 'renew_upgrade' into pre

netflix-dao/src/main/java/com/cyksj/model/views/RenewUpgradePackageView.java

@@ -12,7 +12,8 @@ import java.math.BigDecimal;
  * @date 2024/4/24 15:20
  */
 @Data
-@SearchBean(tables = "renew_upgrade_package up left join goods_don g on up.goods_id = g.id "
+@SearchBean(tables = "renew_upgrade_package up left join goods_don g on up.goods_id = g.id " +
+        " left join goods_don_sku sku on sku.id = up.sku_id"
         , where = "up.deleted = true :sku:",
         orderBy = "up.num asc")
 public class RenewUpgradePackageView {
@@ -43,17 +44,20 @@ public class RenewUpgradePackageView {
     @DbField("up.sku_id")
     private Long skuId;
 
+    @DbField("sku.spec_val")
+    private String specVal;
+
     /**
      * 升级规格
      */
-    @DbField("up.upgrade_sku_id")
-    private Long upgradeSkuId;
+    @DbField("up.upgrade_sku_ids")
+    private String upgradeSkuIds;
 
     /**
      * 商品规格名称
      */
     @DbIgnore
-    private String specVal;
+    private String upgradeSpecVal;
 
 
     /**

netflix-web/src/main/java/com/cyksj/web/controller/manage/renew/RenewUpgradePackageController.java

@@ -118,14 +118,11 @@ public class RenewUpgradePackageController {
 	public Result<SearchResult<RenewUpgradePackageView>> list(Long skuId) {
 		log.info("获取套餐列表");
 		Map<String, Object> build = MapUtils.flatBuilder(request.getParameterMap()).build();
-		if (skuId != null) {
-			build.put("sku", String.format(" and JSON_CONTAINS(up.sku_ids,'\"%s\"')", skuId));
-		}
 		SearchResult<RenewUpgradePackageView> search = beanSearcher.search(RenewUpgradePackageView.class, build);
 		search.getDataList().forEach(upgradePackageView -> {
 			try {
-				String specVal = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class).in(GoodsDonSku::getId, Jsons.parseList(upgradePackageView.getSkuIds(), Long.class))).stream().map(GoodsDonSku::getSpecVal).collect(Collectors.joining(","));
-				upgradePackageView.setSpecVal(specVal);
+				String specVal = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class).in(GoodsDonSku::getId, Jsons.parseList(upgradePackageView.getUpgradeSkuIds(), Long.class))).stream().map(GoodsDonSku::getSpecVal).collect(Collectors.joining(","));
+				upgradePackageView.setUpgradeSpecVal(specVal);
 			} catch (Exception e) {
 				throw BusinessRuntimeException.getInstance("获取套餐规格失败");
 			}