Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

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

@@ -117,12 +117,12 @@
     select t1.enterprise_rule_id enterpriseRuleId, t1.rule_name ruleName, count(DISTINCT t2.enterprise_id) countEnterpriseId
     from tab_config_rule_enterprise t1
     left join tab_config_rule_enterprise_rel t2 on t1.enterprise_rule_id = t2.enterprise_rule_id
+    and t2.status = 1
+    and t2.enterprise_id != -1
     <if test="search != null and search != '' ">
       left join tab_enterprise t3 on t2.enterprise_id = t3.enterprise_id
     </if>
     where t1.status = 1
-    and t2.status = 1
-    and t2.enterprise_id != -1
     <if test="search != null and search != '' ">
       and ( t1.rule_name like concat('%', #{search}, '%')
       or t3.enterprise_name like concat('%', #{search}, '%')

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingPayInfoController.java

@@ -3,6 +3,7 @@ package com.gic.enterprise.web.controller;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.gic.enterprise.utils.UserDetail;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -130,8 +131,8 @@ public class BillingPayInfoController {
                 return EnterpriseRestResponse.failure(serialResponse);
             }
         }
-
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        UserDetail userDetail = UserDetailUtils.getUserDetail();
+        Integer enterpriseId = userDetail.getEnterpriseId();
         ServiceResponse invoiceInfo = billingPayInfoApiService.saveInvoiceAccountToRedis(invoiceDTO, enterpriseId);
         if (invoiceInfo.isSuccess()) {
             InvoiceManageDTO params = new InvoiceManageDTO();
@@ -139,9 +140,9 @@ public class BillingPayInfoController {
             params.setInvoiceType(invoiceType);
             params.setBillingAmount(billingAmount);
             params.setEnterpriseId(enterpriseId);
-            params.setEnterpriseName("test");
-            params.setCompanyName("test");
-            params.setLogo("test");
+            params.setEnterpriseName(userDetail.getEnterpriseInfo().getEnterpriseName());
+            params.setCompanyName(userDetail.getEnterpriseInfo().getCompanyName());
+            params.setLogo(userDetail.getEnterpriseInfo().getLogo());
             params.setTaxNumber(invoiceDTO.getTaxNumber());
             params.setAccountName(invoiceDTO.getAccountName());
             params.setAddress(invoiceDTO.getAddress());