license查询调整：实时查询，不在冗余

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

@@ -53,67 +53,86 @@ public class EnterpriseLicenseDTO implements Serializable{
      */
     private String licenseName;
 
+    private String licenseCode;
+
     public Integer getEnterpriseLicenseId() {
         return enterpriseLicenseId;
     }
 
-    public void setEnterpriseLicenseId(Integer enterpriseLicenseId) {
+    public EnterpriseLicenseDTO setEnterpriseLicenseId(Integer enterpriseLicenseId) {
         this.enterpriseLicenseId = enterpriseLicenseId;
+        return this;
     }
 
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
 
-    public void setEnterpriseId(Integer enterpriseId) {
+    public EnterpriseLicenseDTO setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
+        return this;
     }
 
     public Long getLicenseId() {
         return licenseId;
     }
 
-    public void setLicenseId(Long licenseId) {
+    public EnterpriseLicenseDTO setLicenseId(Long licenseId) {
         this.licenseId = licenseId;
+        return this;
     }
 
     public Integer getLowerLimit() {
         return lowerLimit;
     }
 
-    public void setLowerLimit(Integer lowerLimit) {
+    public EnterpriseLicenseDTO setLowerLimit(Integer lowerLimit) {
         this.lowerLimit = lowerLimit;
+        return this;
     }
 
     public Integer getUpperLimit() {
         return upperLimit;
     }
 
-    public void setUpperLimit(Integer upperLimit) {
+    public EnterpriseLicenseDTO setUpperLimit(Integer upperLimit) {
         this.upperLimit = upperLimit;
+        return this;
     }
 
     public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public EnterpriseLicenseDTO setCreateTime(Date createTime) {
         this.createTime = createTime;
+        return this;
     }
 
     public Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime) {
+    public EnterpriseLicenseDTO setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
+        return this;
     }
 
     public String getLicenseName() {
         return licenseName;
     }
 
-    public void setLicenseName(String licenseName) {
+    public EnterpriseLicenseDTO setLicenseName(String licenseName) {
         this.licenseName = licenseName;
+        return this;
+    }
+
+    public String getLicenseCode() {
+        return licenseCode;
+    }
+
+    public EnterpriseLicenseDTO setLicenseCode(String licenseCode) {
+        this.licenseCode = licenseCode;
+        return this;
     }
 }

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

@@ -2,11 +2,14 @@ package com.gic.enterprise.service.outer.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
+import com.gic.commons.util.CollectionUtil;
 import com.gic.enterprise.constant.BillingAuditStatusEnum;
 import com.gic.enterprise.dto.market.ServeLicenseDTO;
 import com.gic.enterprise.utils.LicenseUtils;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
+import com.gic.open.api.service.EnterpriseLicenseApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -91,6 +94,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     private DataConfigApiService dataConfigApiService;
     @Autowired
     private SmsSendApiService smsSendApiService;
+    @Autowired
+    private EnterpriseLicenseApiService enterpriseLicenseApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -519,7 +524,20 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
 
     @Override
     public ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense(Integer enterpriseId) {
-        return ServiceResponse.success(enterpriseLicenseService.listByEnterpriseId(enterpriseId));
+        ServiceResponse<List<ApplicationLicenseDTO>> hasBuyLicense = enterpriseLicenseApiService.listEnterpriseBuyLicense(Arrays.asList(enterpriseId));
+        if (hasBuyLicense.isSuccess()) {
+            List<ApplicationLicenseDTO> licenseList = hasBuyLicense.getResult();
+            if (CollectionUtils.isNotEmpty(licenseList)) {
+                return ServiceResponse.success(licenseList.stream()
+                .map(e -> new EnterpriseLicenseDTO()
+                            .setLicenseId(e.getLicenseId())
+                            .setUpperLimit(e.getQuantity())
+                            .setLicenseName(e.getLicenseName())
+                            .setLicenseCode(e.getLicenseCode())
+                ).collect(Collectors.toList()));
+            }
+        }
+        return ServiceResponse.success(Collections.emptyList());
     }
 
     @Override

gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml

@@ -143,4 +143,6 @@
     <dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="60000" />
 
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
+
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
 </beans>