1、修改获取续费信息

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

@@ -31,14 +31,28 @@ public class CompanyResponse {
 
     private String gradeCode;
 
+    private String cpManager;
+
+    private String cpPhone;
+
     // 交易记录
     private TradeResponse trade;
 
+    /**
+     * 截止日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDate endDate;
 
     /**
+     * 免费版用户截止日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate userEndDate;
+
+    /**
      * 人数上限 (可以绑定微信的员工人数)
      */
     @ApiModelProperty(value = "人数上限 (可以绑定微信的员工人数)")

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

@@ -146,7 +146,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         try {
             // 设置应用代码
             userLogin.setAppCode(Constant.AppCode.WEB.getCode());
-            return createToken(userLogin);
+            return createToken(userLogin,true);
         } catch (Exception e) {
             log.error("获取accessToken发生异常=", e);
             return ResponseResultUtil.error(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
@@ -171,7 +171,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
             try {
                 // 设置应用代码
                 userLogin.setAppCode(Constant.AppCode.WEIXIN.getCode());
-            return createToken(userLogin);
+            return createToken(userLogin,true);
         } catch (Exception e) {
             log.error("获取accessToken发生异常=", e);
             return ResponseResultUtil.error(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
@@ -404,7 +404,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
 
         userLogin.checkUserLogin();
         try {
-            return createToken(userLogin);
+            return createToken(userLogin,false);
         } catch (Exception e) {
             log.error("获取accessToken发生异常=", e);
             return ResponseResultUtil.error(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
@@ -438,7 +438,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
             }
             userLogin.checkUserLogin();
             try {
-                return createToken(userLogin);
+                return createToken(userLogin,false);
             } catch (OAuthSystemException e) {
                 e.printStackTrace();
                 log.error("获取accessToken发生异常=", e);
@@ -517,7 +517,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
      * @author : 洪旭东
      * @date : 2024-02-20 10:31
      */
-    private ResponseResultVO<?> createToken(UserLogin userLogin) throws OAuthSystemException {
+    private ResponseResultVO<?> createToken(UserLogin userLogin,Boolean checkOverDate) throws OAuthSystemException {
         String clientId = "dkic";
         AuthAccessToken authAccessToken = new AuthAccessToken();
 
@@ -539,9 +539,18 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 String licenseStr = AESUtil.desEncrypt(company.getLicense());
                 if(licenseStr != null ){
                     Map<String,Object> licenseMap = JSON.parseObject(licenseStr,Map.class);
+                    LocalDate endDate = LocalDate.parse(licenseMap.get("end_date").toString());
+                    if(checkOverDate){
+                        // 判断是否到期
+                        LocalDate nowDate = LocalDate.now();
+                        if(endDate.isBefore(nowDate)){
+                            return ResponseResultUtil.error(ErrorCodeEnum.LICENSE_OVER_DATE.getCode(), ErrorCodeEnum.LICENSE_OVER_DATE.getMessage());
+                        }
+                    }
                     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()));
+                    company.setEndDate(endDate);
+                    company.setUserEndDate(LocalDate.parse(licenseMap.get("user_end_date").toString()));
                     company.setGradeCode(licenseMap.get("grade_code").toString());
                 }else{
                     // 获取最近一次的交易记录

src/main/resources/mapper/ActivityMapper.xml

@@ -86,6 +86,9 @@
         <if test="appCode != null and appCode != ''">
             And t.app_code = #{appCode}
         </if>
+        <if test="gradeCode != null and gradeCode != ''">
+            And t.grade_code = #{gradeCode}
+        </if>
         <if test="activityStatus != null and activityStatus != ''">
             And t.activity_status = #{activityStatus}
         </if>

src/main/resources/mapper/CompanyMapper.xml

@@ -22,6 +22,8 @@
         <result column="max_staff_num" property="maxStaffNum"/>
         <result column="cur_staff_num" property="curStaffNum"/>
         <result column="license" property="license"/>
+        <result column="cp_manager" property="cpManager"/>
+        <result column="cp_phone" property="cpPhone"/>
     </resultMap>
 
     <resultMap type="com.dk.oauth.entity.MenuFrequency" id="ResultMenuMap">
@@ -67,6 +69,8 @@
                tac.cp_name,
                tac.svc_code ,
                tac.license,
+               tac.cp_manager,
+               tac.cp_phone,
 --                tac.grade_code,
 --                tac.end_date,
 --                tac.max_staff_num,
@@ -77,7 +81,7 @@
         LEFT JOIN dkic_a.t_s_service tss
         ON tac.svc_code = tss.svc_code
         AND tss.flg_valid
-        where tac.cp_id = #{id} and (tac.end_date is null or tac.end_date +  '1 day'::INTERVAL > now()) and tac.flg_valid
+        where tac.cp_id = #{id}  and tac.flg_valid
     </select>