1、license增加功能包

src/main/java/com/dk/oauth/entity/Activity.java

@@ -157,14 +157,22 @@ public class Activity extends PageInfo<ActivityResponse> implements Serializable
     private String gradeCode;
 
     /**
-     * 系统版本
+     * 功能
      */
-    @Excel(name = "系统版本")
-    @ApiModelProperty(value = "系统版本")
+    @Excel(name = "功能")
+    @ApiModelProperty(value = "功能")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String funUuid;
 
     /**
+     * 功能包
+     */
+    @Excel(name = "功能包")
+    @ApiModelProperty(value = "功能包")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> funUuids;
+
+    /**
      * 投放企业
      */
     @Excel(name = "投放企业")

src/main/java/com/dk/oauth/entity/CompanyResponse.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author : 周兴
@@ -36,6 +37,8 @@ public class CompanyResponse {
 
     private String cpPhone;
 
+    private List<Activity> funPackage;
+
     private Boolean vip;
 
     // 交易记录

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -242,6 +242,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                     if(licenseMap.get("vip") != null){
                         company.setVip(Boolean.parseBoolean(licenseMap.get("vip").toString()));
                     }
+                    if(licenseMap.get("fun_package") != null){
+                        company.setFunPackage(JSON.parseArray(JSON.toJSONString(licenseMap.get("fun_package")),Activity.class));
+                    }
                     company.setGradeCode(licenseMap.get("grade_code").toString());
                 }else{
                     // 获取最近一次的交易记录
@@ -584,6 +587,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                     if(licenseMap.get("vip") != null){
                         company.setVip(Boolean.parseBoolean(licenseMap.get("vip").toString()));
                     }
+                    if(licenseMap.get("fun_package") != null){
+                        company.setFunPackage(JSON.parseArray(JSON.toJSONString(licenseMap.get("fun_package")),Activity.class));
+                    }
                     company.setGradeCode(licenseMap.get("grade_code").toString());
                 }else{
                     // 获取最近一次的交易记录