From c8e7b787d515d720db4642827f4261917eabf12f Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Thu, 18 May 2023 15:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=90=88=E5=B9=B6=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=EF=BC=9A=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/api/JcskInvoiceApiServiceImpl.java   | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java
index eb0da61..2bafb37 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java
@@ -1639,31 +1639,55 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
 
 
     /**
-     * 用户信息处理
+     * 获取登记用户信息
      */
     public InvoiceAllYhdj getUserInfo(Companyservice companyservice) {
 
         String identity = companyservice.getIdentity();
         String sellertax = companyservice.getSellertax();
 
+        String key = WebServiceConstant.TOKEN_KEY + sellertax + "_"+ identity;
+
         RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
-        JSONObject yhdjObj = redisCache.getCacheObject(WebServiceConstant.TOKEN_KEY + sellertax + "_"+ identity);
+        cn.hutool.json.JSONObject yhdjObj = redisCache.getCacheObject(key);
 
-        // TODO: 2023/5/17
-//        JSONObject obj = JSONObject.parseObject(info);
-//        Long exprieTime = System.currentTimeMillis();
-//        exprieTime = exprieTime + (int) obj.get("expires_in") * 1000L; // 过期时间
-//        obj.put("exprieTime", exprieTime);
-//        redisCache.setCacheObject(ElephantConstants.TOKEN_REDIS_KEY + "appkey:" + appkey, obj);
+        if(JSONUtil.isNull(yhdjObj)){
+            // 查询用户登记参数
+            QueryWrapper<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
+            yhdjQueryWrapper.eq("nsrsbh", sellertax);
+            yhdjQueryWrapper.eq("identity", identity);
+            InvoiceAllYhdj invoiceAllYhdj = yhdjMapper.selectOne(yhdjQueryWrapper);
 
-        // 查询用户登记参数
-        QueryWrapper<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
-        yhdjQueryWrapper.eq("nsrsbh", sellertax);
-        yhdjQueryWrapper.eq("identity", identity);
-        InvoiceAllYhdj invoiceAllYhdj = yhdjMapper.selectOne(yhdjQueryWrapper);
+            cn.hutool.json.JSONObject obj = JSONUtil.parseObj(invoiceAllYhdj);
+            Long exprieTime = System.currentTimeMillis(); // 过期时间
+            obj.put("exprieTime", exprieTime);
+            redisCache.setCacheObject(key, obj);
+
+            yhdjObj = obj;
+        }
 
-        return invoiceAllYhdj;
+        return BeanUtil.copyProperties(yhdjObj,InvoiceAllYhdj.class);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 }