会员卡、服务号、小程序、门店依次排序

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

@@ -3,9 +3,11 @@ package com.gic.enterprise.dto;
 import com.gic.enterprise.constant.LicenseTypeEnum;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author guojx
@@ -155,7 +157,19 @@ public class EnterpriseListDTO implements Serializable{
         if (licenseUpperLimitStr == null || licenseUpperLimitStr == "") {
             return "--";
         } else {
-            return licenseUpperLimitStr;
+            //按照会员卡、服务号、小程序、门店分别展示
+            //数据格式 名称:数值-名称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("会员卡");
+            Object serviceCard = map.get("服务号");
+            Object weChat = map.get("小程序");
+            Object store = map.get("门店");
+            return memberCard == null ? "0" : memberCard.toString() + "-"
+                    + serviceCard == null ? "0" : serviceCard.toString() + "-"
+                    + weChat == null ? "0" : weChat.toString() + "-"
+                    + store == null ? "0" : store.toString();
         }
     }
 

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

@@ -283,7 +283,7 @@
     a.company_name companyName,
     a.create_time createTime,
     a.is_init_complete isInitComplete,
-    GROUP_CONCAT(b.upper_limit ORDER BY b.enterprise_license_id separator '-') licenseUpperLimitStr,
+    GROUP_CONCAT(concat(b.license_name,':',b.upper_limit) separator '-') licenseUpperLimitStr,
     a.version_code versionCode,
     a.version_name versionName,
     a.audit_time expirationTime,