商户规则接口

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/EnterpriseListDTO.java

+package com.gic.enterprise.dto.rule;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+@Accessors(chain = true)
+@Data
+public class EnterpriseListDTO implements Serializable{
+    private static final long serialVersionUID = -1472209420502006016L;
+
+
+    /**
+     * 企业主键
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 商户名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     *
+     */
+    private String logo;
+
+    private String ruleName;
+}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/EnterpriseRuleDetailDTO.java

+package com.gic.enterprise.dto.rule;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 商户规则详情
+ * @ClassName: EnterpriseRuleDetailDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/3/5 1:29 PM

+ */
+@Accessors(chain = true)
+@Data
+public class EnterpriseRuleDetailDTO implements Serializable{
+    private static final long serialVersionUID = 8170315160087981103L;
+
+    /**
+     * 规则树
+     */
+    private List<RuleListDTO> ruleList;
+
+    /**
+     *
+     */
+    private Integer enterpriseRuleId;
+
+    /**
+     * 规则名称
+     */
+    private String ruleName;
+
+    /**
+     * 1:部分商户 2:全部商户
+     */
+    private Integer enterpriseType;
+
+    /**
+     * 商户列表
+     */
+    private List<EnterpriseListDTO> enterpriseList;
+}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/ConfigRuleApiService.java

@@ -116,6 +116,26 @@ public interface ConfigRuleApiService {
     
*/
     ServiceResponse<List<RuleListDTO>> getRuleTree(String search, Integer enterpriseRuleId);
 
+    /**
+     * 商户规则详情
+     * @Title: getEnterpriseRuleDetail

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseRuleId

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.rule.EnterpriseRuleDetailDTO>

+    
*/
+    ServiceResponse<EnterpriseRuleDetailDTO> getEnterpriseRuleDetail(Integer enterpriseRuleId);
+
+    /**
+     * 商户列表
+     * @Title: getEnterpriseList

+     * @Description:
+    
* @author guojuxing
+     * @param search
公司名称/商户名称
+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.rule.EnterpriseListDTO>>

+    
*/
+    ServiceResponse<List<EnterpriseListDTO>> getEnterpriseList(String search);
+
     /***************对接其他组*******************/
 
     /**

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabConfigRuleEnterpriseMapper.java

@@ -60,4 +60,6 @@ public interface TabConfigRuleEnterpriseMapper {
     List<RuleEnterpriseDTO> listRule(String search);
 
     List<RuleEnterpriseDTO> listEnterpriseRule(@Param("enterpriseRuleId") Integer enterpriseRuleId, @Param("search") String search);
+
+    List<RuleEnterpriseDTO> listEnterpriseRuleAll();
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabConfigRuleEnterpriseRelMapper.java

@@ -59,4 +59,6 @@ public interface TabConfigRuleEnterpriseRelMapper {
     void deleteByEnterpriseRuleId(Integer enterpriseRuleId);
 
     void deleteByEnterpriseIdList(@Param("list") List<Integer> enterpriseIdList);
+
+    List<TabConfigRuleEnterpriseRel> listEnterprise();
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/ConfigRuleEnterpriseService.java

@@ -118,4 +118,22 @@ public interface ConfigRuleEnterpriseService {
      * @return  java.util.List<com.gic.enterprise.entity.TabConfigRuleRel>

     
*/
     List<TabConfigRuleRel> listRuleRel(Integer enterpriseRuleId);
+
+    /**
+     * 查询所有的商户及所在规则
+     * @Title: listEnterprise

+     * @Description:
+    
* @author guojuxing 

+     * @return  java.util.List<com.gic.enterprise.entity.TabConfigRuleEnterpriseRel>

+    
*/
+    List<TabConfigRuleEnterpriseRel> listEnterprise();
+
+    /**
+     * 查询所有的商户规则
+     * @Title: listEnterpriseRule

+     * @Description:
+    
* @author guojuxing 

+     * @return  java.util.List<com.gic.enterprise.dto.rule.RuleEnterpriseDTO>

+    
*/
+    List<RuleEnterpriseDTO> listEnterpriseRule();
 }

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

@@ -115,4 +115,14 @@ public class ConfigRuleEnterpriseServiceImpl implements ConfigRuleEnterpriseServ
     public List<TabConfigRuleRel> listRuleRel(Integer enterpriseRuleId) {
         return tabConfigRuleRelMapper.listRuleRel(enterpriseRuleId);
     }
+
+    @Override
+    public List<TabConfigRuleEnterpriseRel> listEnterprise() {
+        return tabConfigRuleEnterpriseRelMapper.listEnterprise();
+    }
+
+    @Override
+    public List<RuleEnterpriseDTO> listEnterpriseRule() {
+        return tabConfigRuleEnterpriseMapper.listEnterpriseRuleAll();
+    }
 }

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

@@ -3,13 +3,17 @@ package com.gic.enterprise.service.outer.impl;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.rule.*;
 import com.gic.enterprise.entity.TabConfigRule;
+import com.gic.enterprise.entity.TabConfigRuleEnterprise;
+import com.gic.enterprise.entity.TabConfigRuleEnterpriseRel;
 import com.gic.enterprise.entity.TabConfigRuleRel;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.ConfigRuleApiService;
 import com.gic.enterprise.service.ConfigRuleEnterpriseService;
 import com.gic.enterprise.service.ConfigRuleService;
+import com.gic.enterprise.service.EnterpriseService;
 import com.github.pagehelper.Page;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -24,6 +28,8 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
     private ConfigRuleService configRuleService;
     @Autowired
     private ConfigRuleEnterpriseService configRuleEnterpriseService;
+    @Autowired
+    private EnterpriseService enterpriseService;
 
     @Override
     public ServiceResponse<Integer> saveRule(RuleDTO dto) {
@@ -403,6 +409,75 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
                 configRuleService.listAll(ruleClassifyId)));
     }
 
+    @Override
+    public ServiceResponse<EnterpriseRuleDetailDTO> getEnterpriseRuleDetail(Integer enterpriseRuleId) {
+        TabConfigRuleEnterprise record = configRuleEnterpriseService.getByEnterpriseRuleId(enterpriseRuleId);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "规则D错误，无此规则");
+        }
+        String ruleName = record.getRuleName();
+        //商户列表
+        List<EnterpriseListDTO> enterpriseList = new ArrayList<>();
+        Page<RuleEnterpriseDTO> page = configRuleEnterpriseService.listEnterpriseRule(null, enterpriseRuleId, 1,
+                Integer.MAX_VALUE);
+        if (page != null) {
+            List<RuleEnterpriseDTO> ruleEnterpriseList = page.getResult();
+            if (CollectionUtils.isNotEmpty(ruleEnterpriseList)) {
+                for (RuleEnterpriseDTO ruleEnterpriseDTO : ruleEnterpriseList) {
+                    enterpriseList.add(new EnterpriseListDTO().setCompanyName(ruleEnterpriseDTO.getCompanyName())
+                            .setEnterpriseId(ruleEnterpriseDTO.getEnterpriseId()).setLogo(ruleEnterpriseDTO.getLogo())
+                            .setRuleName(ruleName).setEnterpriseName(ruleEnterpriseDTO.getEnterpriseName()));
+                }
+            }
+        }
+        //规则树
+        ServiceResponse<List<RuleListDTO>> ruleListResult = getRuleTree(null, enterpriseRuleId);
+        return ServiceResponse.success(new EnterpriseRuleDetailDTO().setRuleName(ruleName)
+                .setEnterpriseType(record.getEnterpriseType()).setEnterpriseList(enterpriseList)
+                .setEnterpriseRuleId(enterpriseRuleId).setRuleList(ruleListResult.getResult()));
+    }
+
+    @Override
+    public ServiceResponse<List<EnterpriseListDTO>> getEnterpriseList(String search) {
+        Map<String, TabConfigRuleEnterpriseRel> enterpriseMap = new HashMap<>(16);
+        Map<String, String> enterpriseRuleMap = new HashMap<>(16);
+
+        //商户和规则关联数据，查询商户ID和对应规则ID
+        List<TabConfigRuleEnterpriseRel> rel = configRuleEnterpriseService.listEnterprise();
+        if (CollectionUtils.isNotEmpty(rel)) {
+            for (TabConfigRuleEnterpriseRel ruleEnterpriseRel : rel) {
+                enterpriseMap.put(ruleEnterpriseRel.getEnterpriseId().toString(), ruleEnterpriseRel);
+            }
+        }
+        //查询所有的商户规则ID、名称
+        List<RuleEnterpriseDTO> ruleEnterpriseList = configRuleEnterpriseService.listEnterpriseRule();
+        if (CollectionUtils.isNotEmpty(ruleEnterpriseList)) {
+            for (RuleEnterpriseDTO ruleEnterpriseDTO : ruleEnterpriseList) {
+                enterpriseRuleMap.put(ruleEnterpriseDTO.getEnterpriseRuleId().toString(),
+                        ruleEnterpriseDTO.getRuleName());
+            }
+        }
+        List<EnterpriseDTO> enterpriseDTOList = enterpriseService.listEnterprise();
+
+        if (CollectionUtils.isNotEmpty(enterpriseDTOList)) {
+            List<EnterpriseListDTO> resultList = new ArrayList<>(enterpriseDTOList.size());
+            for (EnterpriseDTO enterpriseDTO : enterpriseDTOList) {
+                Integer enterpriseId = enterpriseDTO.getEnterpriseId();
+                String ruleName = "默认";
+                if (enterpriseMap.containsKey(enterpriseId.toString())) {
+                    TabConfigRuleEnterpriseRel tempRel = enterpriseMap.get(enterpriseId.toString());
+                    ruleName = enterpriseRuleMap.get(tempRel.getEnterpriseRuleId().toString());
+                }
+                resultList.add(new EnterpriseListDTO().setRuleName(ruleName).setLogo(enterpriseDTO.getLogo())
+                        .setEnterpriseName(enterpriseDTO.getEnterpriseName())
+                        .setEnterpriseId(enterpriseDTO.getEnterpriseId())
+                        .setCompanyName(enterpriseDTO.getCompanyName()));
+            }
+            return ServiceResponse.success(resultList);
+        }
+        return ServiceResponse.success(Collections.emptyList());
+    }
+
     private ServiceResponse<Void> validRuleClassify(RuleClassifyDTO dto) {
         TabConfigRule record = configRuleService.getByRuleId(dto.getParentRuleId());
         if (record == null) {

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseMapper.xml

@@ -132,7 +132,7 @@
   </select>
 
   <select id="listEnterpriseRule" parameterType="com.gic.enterprise.dto.rule.RuleEnterpriseDTO">
-    select t2.enterprise_name enterpriseName, t2.company_name companyName, t2.logo logo
+    select t2.enterprise_name enterpriseName, t2.company_name companyName, t2.logo logo, t2.enterprise_id enterpriseId
     from tab_config_rule_enterprise_rel t1
     left join tab_enterprise t2 on t1.enterprise_id = t2.enterprise_id
     where t1.status = 1
@@ -144,4 +144,10 @@
     </if>
     order by t1.create_time desc
   </select>
+
+  <select id="listEnterpriseRuleAll" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_config_rule_enterprise
+    where status = 1
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseRelMapper.xml

@@ -135,4 +135,11 @@
       #{item}
     </foreach>
   </update>
+
+  <select id="listEnterprise" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_config_rule_enterprise_rel
+    where status = 1
+    group by enterprise_id
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/ConfigRuleController.java

@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.gic.operation.web.vo.configrule.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +20,7 @@ import com.gic.enterprise.service.ConfigRuleApiService;
 import com.gic.enterprise.service.ConfigRuleEnterpriseApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.operation.web.vo.SceneCategoryVO;
+import com.gic.operation.web.vo.configrule.*;
 import com.gic.rule.manage.api.service.DealOperationApiService;
 
 @RestController
@@ -158,6 +158,23 @@ public class ConfigRuleController {
         return ResultControllerUtils.commonResult(configRuleEnterpriseApiService.edit(dto));
     }
 
+    @RequestMapping("/getEnterpriseRule")
+    public RestResponse getEnterpriseRule(Integer enterpriseRuleId) {
+        return ResultControllerUtils.commonResult(configRuleApiService.getEnterpriseRuleDetail(enterpriseRuleId));
+    }
+
+    /**
+     * 查询可选择配置的商户列表
+     * @Title: listEnterpriseSelect

+     * @Description:
+    
* @author guojuxing 

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
*/
+    @RequestMapping("/list-enterprise-select")
+    public RestResponse listEnterpriseSelect(String search) {
+        return ResultControllerUtils.commonResult(configRuleApiService.getEnterpriseList(search));
+    }
+
     @RequestMapping("/deleteEnterpriseRule")
     public RestResponse deleteEnterpriseRule(Integer enterpriseRuleId) {
         return ResultControllerUtils