Browse Source

修改用户状态-增加接口判断

xusonglin 5 years ago
parent
commit
aae77d487b

+ 2 - 1
src/main/java/com/jkcredit/invoice/hub/service/apiUser/ApiUserServiceImpl.java

@@ -42,7 +42,7 @@ public class ApiUserServiceImpl extends BaseService implements ApiUserService {
         String userId = "";
         if (object != null) {
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(object));
-            if (!param.getAppSecret().equals(jsonObject.get("appSecret"))) {
+            if (!param.getAppSecret().equals(jsonObject.get("appSecret")) || !jsonObject.get("status").equals("1")) {
                 availableUser = validateUser(param.getAppKey(), param.getAppSecret(), userId);
             } else {
                 userId = jsonObject.get("userId").toString();
@@ -82,6 +82,7 @@ public class ApiUserServiceImpl extends BaseService implements ApiUserService {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("appSecret", appSecret);
             jsonObject.put("userId", userId);
+            jsonObject.put("status", userPo.getStatus().toString());
             redisTemplate.opsForValue().set(CommonConstant.INVOICE_HUB_USER_APPKEY + appKey, jsonObject);
             return true;
         }

+ 16 - 1
src/main/java/com/jkcredit/invoice/hub/service/user/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jkcredit.invoice.hub.service.user;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.hub.constant.CommonConstant;
@@ -17,6 +18,8 @@ import com.jkcredit.invoice.hub.util.EncodeUtil;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +42,9 @@ public class UserServiceImpl extends BaseService implements UserService {
     @Resource
     UserMapper userMapper;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+
     @Override
     public Optional<UserPo> getUserByUserName(String userName) {
         return userMapper.getUserByUserName(userName);
@@ -124,7 +130,16 @@ public class UserServiceImpl extends BaseService implements UserService {
             userPo.setStatus(userDto.getStatus());
         }
         userPo.setUpdateTime(new Date());
-        return userMapper.updateById(userPo) == 1;
+        if (userMapper.updateById(userPo) == 1) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("appSecret", userPo.getAppSecret());
+            jsonObject.put("userId", userPo.getId().toString());
+            jsonObject.put("status", userPo.getStatus().toString());
+            redisTemplate.opsForValue().set(CommonConstant.INVOICE_HUB_USER_APPKEY + userPo.getAppKey(), jsonObject);
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override

+ 1 - 1
src/main/resources/mapper/UserMapper.xml

@@ -90,7 +90,7 @@
 
     <select id="getUserByAppKey" resultMap="baseResultMap">
         select
-            user.id, user.app_key, user.app_secret, user.price, balance.balance
+            user.id, user.app_key, user.app_secret, user.price, user.status, balance.balance
         from
             h_user user
         left join