20241220 付费码管理

PCS/src/main/java/cn/cslg/permission/common/utils/LoginUtils.java

@@ -1,5 +1,7 @@
 package cn.cslg.permission.common.utils;
 
+import cn.cslg.permission.exception.ExceptionEnum;
+import cn.cslg.permission.exception.XiaoShiException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -33,6 +35,9 @@ public class LoginUtils {
         String oriToken = LoginUtils.getToken();
         String q = "token:login:" + oriToken.replace("=", ":");
         String IdS = redisUtil.get(q);
+        if(IdS==null||IdS.trim().equals("")){
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR,"令牌过期，请重新登录");
+        }
         return Integer.parseInt(IdS);
     }
 }

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/VipTypeController.java

@@ -4,6 +4,7 @@ import cn.cslg.permission.common.core.base.Constants;
 import cn.cslg.permission.common.model.Records;
 import cn.cslg.permission.common.model.dto.AppVipTypeDTO;
 import cn.cslg.permission.common.model.dto.QueryVipDTO;
+import cn.cslg.permission.common.model.qiaobi.PersonVipMessVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
 import cn.cslg.permission.common.model.qiaobi.vipType.QueryVipFunctionDTO;
@@ -99,4 +100,10 @@ public class VipTypeController {
         return Response.success(vos);
     }
 
+    @GetMapping("/queryPersonVipType")
+    @Operation(summary = "查询人员的会员类型信息")
+    public String queryTenantVipTypeByCode() {
+        PersonVipMessVO personVipMessVO = appVipTypeService.queryPersonVipType();
+        return Response.success(personVipMessVO);
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AppVipTypeService.java

@@ -5,9 +5,12 @@ import cn.cslg.permission.common.model.dto.AppVipTypeDTO;
 import cn.cslg.permission.common.model.dto.QueryVipDTO;
 import cn.cslg.permission.common.model.dto.TenantVipTypeFunctionAddNewDTO;
 import cn.cslg.permission.common.model.dto.TenantVipTypeFunctionUpdateDTO;
+import cn.cslg.permission.common.model.qiaobi.PersonVipMessVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
 import cn.cslg.permission.common.model.vo.AppVipTypeVO;
+import cn.cslg.permission.common.model.vo.PersonnelVO;
+import cn.cslg.permission.common.utils.CacheUtils;
 import cn.cslg.permission.common.utils.LoginUtils;
 import cn.cslg.permission.domain.Personnel;
 import cn.cslg.permission.domain.TenantVipType;
@@ -44,7 +47,9 @@ public class AppVipTypeService extends ServiceImpl<AppVipTypeMapper, AppVipType>
     private final AssoTenantVipTypeFunctionService assoTenantVipTypeFunctionService;
     private final PersonnelService personnelService;
     private final LoginUtils loginUtils;
-    private EnterpriseCodeService enterpriseCodeService;
+    private final CacheUtils cacheUtils;
+    private final AssoPersonVipTypeService assoPersonVipTypeService;
+    private final EnterpriseCodeService enterpriseCodeService;
 
     public List<QiaoBiVIPTypeVO> qiaoBiVIPTypeVOList(QiaoBiVipTypeDTO qiaoBiVipTypeDTO) {
         qiaoBiVipTypeDTO.setAppCode("4e95e3d926a2a4befa5d913acc0aa9f5");
@@ -205,6 +210,14 @@ public class AppVipTypeService extends ServiceImpl<AppVipTypeMapper, AppVipType>
         List<QiaoBiVIPTypeVO> qiaoBiVIPTypeVOList = this.getBaseMapper().queryQiaobiVipTypeVOs(qiaoBiVipTypeDTO);
         return qiaoBiVIPTypeVOList;
     }
+
+
+    public PersonVipMessVO queryPersonVipType() {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer personId = Integer.parseInt(personnelVO.getId());
+        PersonVipMessVO personVipMessVO = assoPersonVipTypeService.getPersonVipMessage(personId);
+        return personVipMessVO;
+    }
 }
 
 

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoPersonVipTypeService.java

@@ -133,7 +133,7 @@ public class AssoPersonVipTypeService extends ServiceImpl<AssoPersonVipTypeMappe
         if(vipId!=null){
             LambdaQueryWrapper<AssoPersonVipType> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AssoPersonVipType::getVipTypeId, vipId);
-//            queryWrapper.eq(AssoPersonVipType::getPersonId,personId);
+            queryWrapper.eq(AssoPersonVipType::getPersonId,personId);
              AssoPersonVipType assoPersonVipType =this.getOne(queryWrapper,false);
             expitrTime=assoPersonVipType.getExpitrTime();
           TenantVipType tenantVipType =  tenantVipTypeService.getById(vipId);