功能包

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

@@ -10,6 +10,7 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author : 周兴
@@ -37,7 +38,7 @@ public class CompanyResponse {
 
     private String cpPhone;
 
-    private List<Activity> funPackage;
+    private List<Map<String,Object>> funPackage;
 
     private Boolean vip;
 

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

@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业
@@ -344,7 +345,7 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
      * @author : 姜永辉
      * @date   : 2024/07/03 14:33
      */
-    private List<Activity> funPackage;
+    private List<Map<String,Object>> funPackage;
 
     /*
      * 相关属性

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

@@ -243,7 +243,8 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                         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.setFunPackage(JSON.parseArray(JSON.toJSONString(licenseMap.get("fun_package")),Activity.class));
+                        company.setFunPackage((List<Map<String, Object>>) licenseMap.get("fun_package"));
                     }
                     company.setGradeCode(licenseMap.get("grade_code").toString());
                 }else{
@@ -588,7 +589,8 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                         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.setFunPackage(JSON.parseArray(JSON.toJSONString(licenseMap.get("fun_package")),Activity.class));
+                        company.setFunPackage((List<Map<String, Object>>) licenseMap.get("fun_package"));
                     }
                     company.setGradeCode(licenseMap.get("grade_code").toString());
                 }else{

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

@@ -525,7 +525,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         licenseMap.put("web_max_num", companyVO.getWebMaxNum());
         licenseMap.put("wx_max_num", companyVO.getWxMaxNum());
         licenseMap.put("vip", companyVO.getVip());
-        licenseMap.put("fun_package", companyVO.getFunPackage());
+        licenseMap.put("fun_package", companyVO.getFunPackage() );
         company.setLicenseSocial(AESUtil.aesEncrypt(JSON.toJSONString(licenseMap)));
         companyMapper.updateById(company);
         // 生成交易记录