商户规则修改

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

@@ -334,7 +334,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
             Map<String, List<RuleClassifySceneListDTO>> ruleClassifyMap = new HashMap<>(16);
             for (TabConfigRule rule : list) {
                 Boolean select = false;
-                if (ruleRelMap.contains(rule.getRuleId())) {
+                if (ruleRelMap.contains(rule.getRuleId().toString())) {
                     select = true;
                 }
                 //必有值，如果为空，则说明数据错误，需要修正
@@ -412,7 +412,19 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
                 if (CollectionUtils.isNotEmpty(ruleList)) {
                     for (RuleListDTO ruleListDTO : ruleList) {
                         if (ruleListDTO.getAppCode().equals(appCode)) {
-                            return ServiceResponse.success(ruleListDTO.getRuleClassifyList());
+                            //勾选中的列表
+                            List<RuleClassifyListDTO> temp = ruleListDTO.getRuleClassifyList();
+                            List<RuleClassifyListDTO> select = new ArrayList<>();
+                            if (CollectionUtils.isNotEmpty(temp)) {
+                                for (RuleClassifyListDTO dto : temp) {
+                                    if (dto.getSelect()) {
+                                        //场景重置
+                                        dto.setRuleClassifySceneList(null);
+                                        select.add(dto);
+                                    }
+                                }
+                            }
+                            return ServiceResponse.success(select);
                         }
                     }
                 }
@@ -453,7 +465,20 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
                             if (CollectionUtils.isNotEmpty(classifyList)) {
                                 for (RuleClassifyListDTO classifyListDTO : classifyList) {
                                     if (classifyListDTO.getRuleId().intValue() == ruleClassifyId.intValue()) {
-                                        return ServiceResponse.success(classifyListDTO.getRuleClassifySceneList());
+                                        if (!classifyListDTO.getSelect()) {
+                                            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，商户规则未配置该分类");
+                                        }
+                                        //勾选中的，即配置可用的
+                                        List<RuleClassifySceneListDTO> temp = classifyListDTO.getRuleClassifySceneList();
+                                        List<RuleClassifySceneListDTO> select = new ArrayList<>();
+                                        if (CollectionUtils.isNotEmpty(temp)) {
+                                            for (RuleClassifySceneListDTO dto : temp) {
+                                                if (dto.getSelect()) {
+                                                    select.add(dto);
+                                                }
+                                            }
+                                        }
+                                        return ServiceResponse.success(select);
                                     }
                                 }
                             }