小程序也没装修

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletDecorationConfigApiServiceImpl.java

 package com.gic.enterprise.service.outer.impl;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.EntityUtil;
@@ -108,8 +110,14 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             result.setGpsDecisionCard(0);
             result.setEnterpriseId(enterpriseId);
             result.setAppId(appId);
-            //开卡认证关联
-            result.setOpenCardAuth(mainCardId.toString());
+            //开卡认证关联,全部的卡列表
+            //校验参数数值是否非法
+            ServiceResponse<List<AppletCardDTO>> appletCardResult = getMemberCardByAppId(appId, enterpriseId);
+            if (!appletCardResult.isSuccess()) {
+                return ServiceResponse.failure(appletCardResult.getCode(), appletCardResult.getMessage());
+            }
+            List<AppletCardDTO> appletCardList = appletCardResult.getResult();
+            result.setOpenCardAuth(appletCardList.stream().map(e -> e.getCardConfigId().toString()).collect(Collectors.joining(",")));
             return ServiceResponse.success(result);
         }
         AppletDecorationConfigDTO dto = EntityUtil.changeEntityNew(AppletDecorationConfigDTO.class, record);
@@ -214,20 +222,20 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             return ServiceResponse.failure(appletCardResult.getCode(), appletCardResult.getMessage());
         }
         List<AppletCardDTO> appletCardList = appletCardResult.getResult();
-        Map<String, List<AppletCardDTO>> appletCardMap = new HashMap<>(16);
+        Map<String, List<AppletCardDTO>> appletCardMap = appletCardList
+                .stream()
+                .collect(Collectors.toMap(e -> e.getCardConfigId().toString(), e -> e.getSubList() ));
         //子卡
-        List<String> appletSubCardList = new ArrayList<>();
-        for (AppletCardDTO cardDTO : appletCardList) {
-            appletCardMap.put(cardDTO.getCardConfigId().toString(), cardDTO.getSubList());
-            List<AppletCardDTO> subList = cardDTO.getSubList();
-            if (CollectionUtils.isNotEmpty(subList)) {
-                for (AppletCardDTO cardDTO1 : subList) {
-                    if (cardDTO1.getCardConfigId().toString().equals(mainCardId.toString())) {
-                        appletSubCardList.add(cardDTO.getCardConfigId().toString());
-                    }
-                }
-            }
-        }
+        List<String> appletSubCardList = appletCardList
+                .stream()
+                .filter(e -> CollectionUtils.isNotEmpty(e.getSubList()))
+                .filter(e -> {
+                    List<AppletCardDTO> subList = e.getSubList();
+                    return subList.stream()
+                            .anyMatch(son -> son.getCardConfigId().toString().equals(mainCardId.toString()));
+                })
+                .map(e -> e.getCardConfigId().toString())
+                .collect(Collectors.toList());
 
         //需要校验的数值集合
         Map<String, String> needValidMap = new HashMap<>(16);
@@ -236,6 +244,7 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         //数据资产
         //总积分
         String totalIntegral = appletDataAssetArea.getIntegral();
+        //线下订单
         String order = appletDataAssetArea.getOrder();
         needValidMap.put("数据资产-总积分", totalIntegral);
         needValidMap.put("数据资产-卡券包", appletDataAssetArea.getCoupon());
@@ -270,8 +279,12 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
                     subListSet.add(temp.getCardConfigId().toString());
                 }
             }
-            if (!totalIntegral.toString().equals(order) && !subListSet.contains(order)) {
-                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "数据资产-线下订单只能选择总积分小程序主卡关联的平衡组卡及其子卡");
+            if (!totalIntegral.toString().equals(order)) {
+                boolean validOrder = Stream.of(order.split(","))
+                        .anyMatch(e -> !subListSet.contains(e));
+                if (validOrder) {
+                    return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "数据资产-线下订单只能选择总积分小程序主卡关联的平衡组卡及其子卡");
+                }
             }
         }
 
@@ -282,6 +295,8 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         appletDataAssetArea.setMemberAchievement(mainCardId.toString());
         //会员任务
         appletDataAssetArea.setMemberTask(mainCardId.toString());
+        //关联卡组,全部的卡
+        dto.setOpenCardAuth(appletCardList.stream().map(e -> e.getCardConfigId().toString()).collect(Collectors.joining(",")));
 
         Integer gpsDecisionCard = dto.getGpsDecisionCard();
         if (gpsDecisionCard == null) {