1、修改修改续费功能

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

@@ -35,6 +35,8 @@ public class CompanyResponse {
 
     private String cpPhone;
 
+    private Boolean vip;
+
     // 交易记录
     private TradeResponse trade;
 

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

@@ -333,6 +333,11 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
      */
     private Integer wxMaxNum;
 
+    /**
+     * vip功能
+     */
+    private Boolean vip;
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -223,10 +223,32 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 String licenseStr = AESUtil.desEncrypt(company.getLicense());
                 if(licenseStr != null ){
                     Map<String,Object> licenseMap = JSON.parseObject(licenseStr,Map.class);
-                    company.setWebMaxNum(Integer.parseInt(licenseMap.get("web_max_num").toString()));
-                    company.setWxMaxNum(Integer.parseInt(licenseMap.get("wx_max_num").toString()));
-                    company.setEndDate(LocalDate.parse(licenseMap.get("end_date").toString()));
+                    LocalDate endDate = LocalDate.parse(licenseMap.get("end_date").toString());
+                    // 判断是否到期
+                    LocalDate nowDate = LocalDate.now();
+                    if(endDate.isBefore(nowDate)){
+                        return ResponseResultUtil.error(ErrorCodeEnum.LICENSE_OVER_DATE.getCode(), ErrorCodeEnum.LICENSE_OVER_DATE.getMessage());
+                    }
+                    if(licenseMap.get("web_max_num") != null){
+                        company.setWebMaxNum(Integer.parseInt(licenseMap.get("web_max_num").toString()));
+                    }
+                    if(licenseMap.get("wx_max_num") != null){
+                        company.setWxMaxNum(Integer.parseInt(licenseMap.get("wx_max_num").toString()));
+                    }
+                    company.setEndDate(endDate);
+                    if(licenseMap.get("user_end_date") != null){
+                        company.setUserEndDate(LocalDate.parse(licenseMap.get("user_end_date").toString()));
+                    }
+                    if(licenseMap.get("vip") != null){
+                        company.setVip(Boolean.parseBoolean(licenseMap.get("vip").toString()));
+                    }
                     company.setGradeCode(licenseMap.get("grade_code").toString());
+                }else{
+                    // 获取最近一次的交易记录
+                    List<TradeResponse> tradeResponses = tradeMapper.selectTrade(new Trade().setCpId(company.getCpId()));
+                    if(tradeResponses != null && tradeResponses.size() >0){
+                        company.setTrade(tradeResponses.get(0));
+                    }
                 }
                 JWTGenerator jwtGenerator = new JWTGenerator();
                 jwtGenerator.setSalt(username);
@@ -557,6 +579,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                     if(licenseMap.get("user_end_date") != null){
                         company.setUserEndDate(LocalDate.parse(licenseMap.get("user_end_date").toString()));
                     }
+                    if(licenseMap.get("vip") != null){
+                        company.setVip(Boolean.parseBoolean(licenseMap.get("vip").toString()));
+                    }
                     company.setGradeCode(licenseMap.get("grade_code").toString());
                 }else{
                     // 获取最近一次的交易记录

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

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

src/main/resources/mapper/ActivityMapper.xml

@@ -73,7 +73,8 @@
             ti.web_price  AS "webPrice",
             ti.wx_price  AS "wxPrice",
             ti.valid_long  AS "validLong",
-            ti.extra_long AS "extraLong"
+            ti.extra_long AS "extraLong",
+            T.activity_type AS "activityType"
         FROM
             dkic_a.t_mst_activity_item ti
                 INNER JOIN dkic_a.t_mst_activity T ON ti.activity_id = T.activity_id