商户列表查询：license获取修改

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

@@ -25,8 +25,6 @@ public class EnterpriseListDTO implements Serializable{
 
     private String logo;
 
-    private String licenseUpperLimitStr;
-
     /**
      * 自左向右显示会员卡、服务号、小程序、门店、商品5大业务对象的license授权额度。
      *  受显示宽度限制，区间型license仅显示区间峰值。
@@ -103,14 +101,6 @@ public class EnterpriseListDTO implements Serializable{
         this.logo = logo;
     }
 
-    public String getLicenseUpperLimitStr() {
-        return licenseUpperLimitStr;
-    }
-
-    public void setLicenseUpperLimitStr(String licenseUpperLimitStr) {
-        this.licenseUpperLimitStr = licenseUpperLimitStr;
-    }
-
     public String getVersionCode() {
         return versionCode;
     }
@@ -160,27 +150,7 @@ public class EnterpriseListDTO implements Serializable{
     }
 
     public String getServiceInfo() {
-        if (licenseUpperLimitStr == null || licenseUpperLimitStr == "") {
-            return "--";
-        } else {
-            //按照会员卡、服务号、小程序、门店分别展示
-            //数据格式 名称:数值-名称2:数值2
-            Map<String, Object> map = Arrays.stream(licenseUpperLimitStr.split("-"))
-                    .map(e -> e.split(":"))
-                    .collect(Collectors.toMap(e -> e[0], e -> e[1]));
-            Object memberCard = map.get(LicenseUtils.MEMBER_CARD_LICENSE_NAME);
-            Object serviceCard = map.get(LicenseUtils.SERVICE_CARD_LICENSE_NAME);
-            Object weChat = map.get(LicenseUtils.WECHAT_LICENSE_NAME);
-            Object store = map.get(LicenseUtils.STORE_LICENSE_NAME);
-            //商品license，用于前端license扩容的时候判断：商品数量不变,不提交商品license数据给接口
-            Object goods = map.get(LicenseUtils.GOODS_LICENSE_NAME);
-            setGoodsCount(goods == null ? 0 : Integer.parseInt(goods.toString()));
-
-            return (memberCard == null ? "0" : memberCard.toString()) + "-"
-                    + (serviceCard == null ? "0" : serviceCard.toString()) + "-"
-                    + (weChat == null ? "0" : weChat.toString()) + "-"
-                    + (store == null ? "0" : store.toString());
-        }
+        return serviceInfo;
     }
 
     public void setServiceInfo(String serviceInfo) {

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

@@ -283,7 +283,6 @@
     a.company_name companyName,
     a.create_time createTime,
     a.is_init_complete isInitComplete,
-    GROUP_CONCAT(concat(b.license_name,':',b.upper_limit) separator '-') licenseUpperLimitStr,
     a.version_code versionCode,
     a.version_name versionName,
     a.audit_time expirationTime,
@@ -291,7 +290,6 @@
     if(a.audit_time is not null, DATEDIFF(a.audit_time, now()), 0) aboutToExpireDay
     FROM
     tab_enterprise a
-    LEFT JOIN tab_enterprise_license b ON a.enterprise_id = b.enterprise_id
 
     where  status = 1
     <if test="search != null and search != '' ">

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

@@ -7,9 +7,12 @@ import java.util.stream.Collectors;
 import com.gic.authcenter.security.core.constant.DataResourceEnum;
 import com.gic.authcenter.security.core.dto.AuthcenterUserDetails;
 import com.gic.enterprise.constants.Constants;
+import com.gic.enterprise.dto.*;
 import com.gic.marketing.api.service.sms.SmsOuterApiService;
 import com.gic.member.config.api.dto.OwnerMemberCardDTO;
 import com.gic.member.config.api.service.MemberCardApiService;
+import com.gic.open.api.dto.ApplicationLicenseDTO;
+import com.gic.open.api.service.*;
 import com.gic.operation.web.vo.MemberCardVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -36,10 +39,6 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.constant.EnterpriseInitCodeEnum;
 import com.gic.enterprise.constant.EnterpriseListOrderByEnum;
 import com.gic.enterprise.constant.EnterpriseVersionStatusEnum;
-import com.gic.enterprise.dto.EnterpriseDTO;
-import com.gic.enterprise.dto.EnterpriseInitDTO;
-import com.gic.enterprise.dto.EnterpriseLicenseDTO;
-import com.gic.enterprise.dto.EnterpriseResourceRelDTO;
 import com.gic.enterprise.dto.market.OrderBuyLicenseDTO;
 import com.gic.enterprise.dto.market.OrderGicDTO;
 import com.gic.enterprise.error.ErrorCode;
@@ -60,10 +59,6 @@ import com.gic.open.api.dto.ApplicationTokenDTO;
 import com.gic.open.api.dto.OrderDTO;
 import com.gic.open.api.dto.OrderItemDTO;
 import com.gic.open.api.dto.market.MarketUserDTO;
-import com.gic.open.api.service.AppTokenApiService;
-import com.gic.open.api.service.CouponApiService;
-import com.gic.open.api.service.OrderApiService;
-import com.gic.open.api.service.ServeApiService;
 import com.gic.open.api.service.market.MarketAppCategoryApiService;
 import com.gic.open.api.service.market.MarketUserApiService;
 import com.gic.operation.web.qo.PageQO;
@@ -112,6 +107,8 @@ public class EnterpriseController {
     private MemberCardApiService memberCardApiService;
     @Autowired
     private SmsOuterApiService smsOuterApiService;
+    @Autowired
+    private EnterpriseLicenseApiService enterpriseLicenseApiService;
 
     @RequestMapping("/save-enterprise")
     public RestResponse saveEnterprise(
@@ -186,7 +183,48 @@ public class EnterpriseController {
         if (permissionAll) {
             params.setListAll(1);
         }
-        return ResultControllerUtils.commonResult(enterpriseApiService.listEnterprise(params));
+
+        ServiceResponse<Page<EnterpriseListDTO>> response = enterpriseApiService.listEnterprise(params);
+        if (response.isSuccess()) {
+            Page<EnterpriseListDTO> pageResult = response.getResult();
+            if (pageResult != null) {
+                List<EnterpriseListDTO> listResult = pageResult.getResult();
+                if (CollectionUtils.isNotEmpty(listResult)) {
+                    List<Integer> tempEnterpriseIdList = listResult.stream()
+                            .filter(e -> e.getServiceStatus().intValue() != 0)
+                            .map(e -> e.getEnterpriseId())
+                            .collect(Collectors.toList());
+                    //实时查询license数据
+                    ServiceResponse<List<ApplicationLicenseDTO>> hasBuyLicense = enterpriseLicenseApiService.listEnterpriseBuyLicense(tempEnterpriseIdList);
+                    if (hasBuyLicense.isSuccess()) {
+                        List<ApplicationLicenseDTO> licenseList = hasBuyLicense.getResult();
+                        if (CollectionUtils.isNotEmpty(licenseList)) {
+                            Map<String, List<ApplicationLicenseDTO>> licenseMap = CollectionUtil.group(licenseList, "enterpriseId");
+                            listResult.forEach(e -> {
+                                List<ApplicationLicenseDTO> tempLicense = licenseMap.get(e.getEnterpriseId().toString());
+                                if (CollectionUtils.isNotEmpty(tempLicense)) {
+                                    Set<String> licenseCodeSet = new HashSet<>(Arrays.asList("165165", "member_card", "wxapp", "wxfwh"));
+                                    Map<String, Integer> showLicenseMap = new HashMap<>(8);
+                                    tempLicense.forEach(license -> {
+                                        if (licenseCodeSet.contains(license.getLicenseCode())) {
+                                            showLicenseMap.put(license.getLicenseCode(), license.getQuantity());
+                                        }
+                                    });
+                                    Integer memberCardNum = showLicenseMap.get("member_card") == null ? 0 : showLicenseMap.get("member_card");
+                                    Integer wxfwhNum = showLicenseMap.get("wxfwh") == null ? 0 : showLicenseMap.get("wxfwh");
+                                    Integer wxappNum = showLicenseMap.get("wxapp") == null ? 0 : showLicenseMap.get("wxapp");
+                                    Integer storeNum = showLicenseMap.get("165165") == null ? 0 : showLicenseMap.get("165165");
+                                    e.setServiceInfo(memberCardNum + "-" + wxfwhNum + "-" + wxappNum + "-" + storeNum);
+                                }
+                            });
+                        }
+                    }
+                }
+
+                return RestResponse.success(pageResult);
+            }
+        }
+        return ResultControllerUtils.commonResult(response);
     }
 
     /**

gic-platform-operation-web/src/main/resources/dubbo-gic-platform-operation-web.xml

@@ -92,4 +92,5 @@
 
     <dubbo:reference interface="com.gic.authcenter.api.service.GicDepartmentService" id="gicDepartmentService" timeout="6000" />
     <dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
 </beans>
\ No newline at end of file