update

src/main/java/cn/qg/qaplatform/dao/QueryBasicLoanStatusDataMapper.java

@@ -2,7 +2,7 @@ package cn.qg.qaplatform.dao;
 
 
 import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.domain.LoanUser;
+import cn.qg.qaplatform.domain.QueryLoanUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,7 +14,7 @@ public interface QueryBasicLoanStatusDataMapper {
      * @param uuidList
      * @return
      */
-    List<LoanUser> getUserDataListByUuidList(List<String> uuidList);
+    List<QueryLoanUser> getUserDataListByUuidList(List<String> uuidList);
 
     /**
      * 获取未申请用户数据uuidList
@@ -32,7 +32,7 @@ public interface QueryBasicLoanStatusDataMapper {
      * @param userIdList
      * @return
      */
-    List<LoanUser> getUserDataListByUserIdList(List<String> userIdList);
+    List<QueryLoanUser> getUserDataListByUserIdList(List<String> userIdList);
 
     /**
      * 根据审核状态获取用户Id列表

src/main/java/cn/qg/qaplatform/domain/LoanUser.java → src/main/java/cn/qg/qaplatform/domain/QueryLoanUser.java

@@ -7,7 +7,7 @@ import java.util.Date;
  * 捞数据返回的用户实体类
  */
 @Data
-public class LoanUser {
+public class QueryLoanUser {
     /**
      * 手机号
      */

src/main/java/cn/qg/qaplatform/service/QueryBasicLoanStatusDataService.java

 package cn.qg.qaplatform.service;
 
 import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.domain.LoanUser;
+import cn.qg.qaplatform.domain.QueryLoanUser;
 
 import java.util.List;
 import java.util.Map;
@@ -23,7 +23,7 @@ public interface QueryBasicLoanStatusDataService {
     /**
      * 根据uuid获取用户信息
      */
-    List<LoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList);
+    List<QueryLoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList);
 
     /**
      * 获取未申请用户
@@ -49,7 +49,7 @@ public interface QueryBasicLoanStatusDataService {
     /**
      * 根据userIdList获取用户信息列表
      */
-    List<LoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList);
+    List<QueryLoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList);
 
     /**
      * 获取不同放款状态的用户

src/main/java/cn/qg/qaplatform/service/impl/GenUserDataServiceImpl.java

@@ -134,8 +134,8 @@ public class GenUserDataServiceImpl implements GenUserDataService {
             redisTemplate.opsForValue().set(redisKey, 2);
             log.info("提现成功，设置redis缓存：" + redisKey + ": 2");
         } else {
-            redisTemplate.opsForValue().set(redisKey, 3);
-            log.info("提现失败，设置redis缓存：" + redisKey + ": 3");
+            redisTemplate.opsForValue().set(redisKey, 10);
+            log.info("提现失败，设置redis缓存：" + redisKey + ": 10");
         }
         return result;
     }
@@ -177,11 +177,11 @@ public class GenUserDataServiceImpl implements GenUserDataService {
         // 放款结果通知
         boolean result = MainProcess.payNotify(namespace, loanId, payStatus);
         if (result) {
-            redisTemplate.opsForValue().set(namespace + "_" + phoneNo, 4);
-            log.info("放款成功，设置redis缓存：" + namespace + "-" + phoneNo + ": 4");
+            redisTemplate.opsForValue().set(namespace + "_" + phoneNo, 3);
+            log.info("放款成功，设置redis缓存：" + namespace + "-" + phoneNo + ": 3");
         } else {
-            redisTemplate.opsForValue().set(namespace + "_" + phoneNo, 5);
-            log.info("放款失败，设置redis缓存：" + namespace + "-" + phoneNo + ": 5");
+            redisTemplate.opsForValue().set(namespace + "_" + phoneNo, 4);
+            log.info("放款失败，设置redis缓存：" + namespace + "-" + phoneNo + ": 4");
         }
         return result;
     }
@@ -271,15 +271,15 @@ public class GenUserDataServiceImpl implements GenUserDataService {
             genLoanUser.setStatus("提现成功");
         }
         // 提现失败
-        if (redisResult.equals("3")) {
+        if (redisResult.equals("10")) {
             genLoanUser.setStatus("提现失败");
         }
         // 放款成功
-        if (redisResult.equals("4")) {
+        if (redisResult.equals("3")) {
             genLoanUser.setStatus("放款成功");
         }
         // 放款失败
-        if (redisResult.equals("5")) {
+        if (redisResult.equals("4")) {
             genLoanUser.setStatus("放款失败");
         }
         return genLoanUser;

src/main/java/cn/qg/qaplatform/service/impl/QueryBasicLoanStatusDataServiceImpl.java

@@ -4,7 +4,7 @@ import cn.qg.qaplatform.common.enums.LoanStatus;
 import cn.qg.qaplatform.common.enums.Namespace;
 import cn.qg.qaplatform.dao.QueryBasicLoanStatusDataMapper;
 import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.domain.LoanUser;
+import cn.qg.qaplatform.domain.QueryLoanUser;
 import cn.qg.qaplatform.common.SwitchDataSource;
 import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +59,7 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
      * @return
      */
     @Override
-    public List<LoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList) {
+    public List<QueryLoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
         return basicLoanStatusDataMapper.getUserDataListByUuidList(uuidList);
     }
@@ -130,9 +130,9 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
      * @return
      */
     @Override
-    public List<LoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList) {
+    public List<QueryLoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        List<LoanUser> result = basicLoanStatusDataMapper.getUserDataListByUserIdList(userIdList);
+        List<QueryLoanUser> result = basicLoanStatusDataMapper.getUserDataListByUserIdList(userIdList);
         return result;
     }
 

src/main/java/cn/qg/qaplatform/service/impl/QueryLoanUserDataServiceImpl.java

 package cn.qg.qaplatform.service.impl;
 
-import cn.qg.qaplatform.domain.LoanUser;
+import cn.qg.qaplatform.domain.QueryLoanUser;
 import cn.qg.qaplatform.service.QueryLoanUserDataService;
 import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
@@ -36,7 +36,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
     @Override
     public PageResult getLoanUserData(String namespace, Integer status, Integer channel, Integer fundId, Integer pageNum, Integer pageSize) {
 
-        List<LoanUser> result = new ArrayList<>();
+        List<QueryLoanUser> result = new ArrayList<>();
 
         /**
          * 0-注册未申请
@@ -49,7 +49,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             }
             PageHelper.startPage(pageNum, pageSize);
             result = basicLoanStatusDataService.getUserDataListByUuidList(namespace, uuidList);
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -65,7 +65,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             }
             PageHelper.startPage(pageNum, pageSize);
             result = basicLoanStatusDataService.getUserDataListByUserIdList(namespace, userIdList);
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -86,7 +86,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             } else {
                 result.forEach((item) -> item.setFundId(fundId));
             }
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -107,7 +107,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             } else {
                 result.forEach((item) -> item.setFundId(fundId));
             }
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -124,7 +124,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             PageHelper.startPage(pageNum, pageSize);
             result = basicLoanStatusDataService.getUserDataListByUserIdList(namespace, userIdList);
             result.forEach((item) -> item.setFundId(fundId));
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -145,7 +145,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             } else {
                 result.forEach((item) -> item.setFundId(fundId));
             }
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -167,7 +167,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             } else {
                 result.forEach((item) -> item.setFundId(fundId));
             }
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
@@ -183,7 +183,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             }
             PageHelper.startPage(pageNum, pageSize);
             result = basicLoanStatusDataService.getUserDataListByUuidList(namespace, uuidList);
-            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }

src/main/resources/mapper/QueryBasicLoanStatusDataMapper.xml

@@ -13,7 +13,7 @@
     </select>
 
     <!-- 根据uuidList获取用户信息列表   -->
-    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.domain.LoanUser">
+    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.domain.QueryLoanUser">
         SELECT `id` as userId, `phone_no` as phoneNo, `uuid`, `registered_from` as registeredFrom, `enable`, `created_at` as createdAt  FROM `user`
         where `uuid` in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -28,7 +28,7 @@
     </select>
 
     <!-- 根据userIdList获取用户信息List   -->
-    <select id="getUserDataListByUserIdList" resultType="cn.qg.qaplatform.domain.LoanUser">
+    <select id="getUserDataListByUserIdList" resultType="cn.qg.qaplatform.domain.QueryLoanUser">
         SELECT  `id` as userId, `uuid`, `phone_no` as phoneNo, `registered_from` as registeredFrom, `enable`, `created_at` as createdAt FROM `user`
         where `id` in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">