Merge branch 'mj_upgrade' into pre

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

@@ -39,8 +39,8 @@ public class UpgradePackageView {
     /**
      * 商品规格id
      */
-    @DbField("up.sku_id")
-    private String skuId;
+    @DbField("up.sku_ids")
+    private String skuIds;
 
     /**
      * 商品规格名称

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -238,7 +238,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setPayTime(payTime);
 			}
 			if (ticket.getGoodsId() == 26 && ticket.getIsMirror()){
-				List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_id,'\""+ticket.getSkuId()+"\"')").eq(UpgradePackage::getStatus, Boolean.TRUE));
+				List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\""+ticket.getSkuId()+"\"')").eq(UpgradePackage::getStatus, Boolean.TRUE));
 				if (CollectionUtil.isNotEmpty(upgradePackages)){
 					upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
 				}

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

@@ -1258,7 +1258,7 @@ public class GoodsDonController {
 		log.info("获取套餐列表");
 		Map<String, Object> build = MapUtils.flatBuilder(request.getParameterMap()).build();
 		if (skuId != null) {
-			build.put("sku", String.format(" and JSON_CONTAINS(up.sku_id,'\"%s\"')", skuId));
+			build.put("sku", String.format(" and JSON_CONTAINS(up.sku_ids,'\"%s\"')", skuId));
 		}
 		SearchResult<UpgradePackageView> search = beanSearcher.search(UpgradePackageView.class, build);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);

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

@@ -121,12 +121,12 @@ public class UpgradePackageController {
         log.info("获取套餐列表");
         Map<String, Object> build = MapUtils.flatBuilder(request.getParameterMap()).build();
         if (skuId != null) {
-            build.put("sku", String.format(" and JSON_CONTAINS(up.sku_id,'\"%s\"')", skuId));
+            build.put("sku", String.format(" and JSON_CONTAINS(up.sku_ids,'\"%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(","));
+                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);
             } catch (Exception e) {
                 throw BusinessRuntimeException.getInstance("获取套餐规格失败");