新增多订单

src/main/java/cn/quantgroup/qaplatform/common/SwitchDataSource.java

@@ -112,5 +112,19 @@ public class SwitchDataSource {
             DynamicDataSource.dataSourcesMap.put(dbKey, druidDataSource);
             DynamicDataSource.setDataSource(dbKey);
         }
+
+        /**
+         * fe 环境
+         */
+        if (namespace.equals("fe")) {
+            DruidDataSource druidDataSource = new DruidDataSource();
+            String url = Namespace.FE.getUrl() + database + SUFFIX;
+            String dbKey = Namespace.FE.getKey();
+            druidDataSource.setUrl(url);
+            druidDataSource.setUsername(Namespace.FE.getUsername());
+            druidDataSource.setPassword(Namespace.FE.getPassword());
+            DynamicDataSource.dataSourcesMap.put(dbKey, druidDataSource);
+            DynamicDataSource.setDataSource(dbKey);
+        }
     }
 }

src/main/java/cn/quantgroup/qaplatform/common/enums/LoanStatus.java

@@ -13,7 +13,7 @@ public enum LoanStatus {
     LOAN_ING(5, "放款中"),
     LOAN_SUCESS(6, "放款成功"),
     LOAN_FAIL(7, "放款失败"),
-    MULTI_ORDER(8, "多订单未申请");
+    MULTI_ORDER(8, "多订单白名单");
 
     private Integer status;
     private String desc;

src/main/java/cn/quantgroup/qaplatform/common/enums/Namespace.java

@@ -8,7 +8,8 @@ public enum Namespace {
     QA3("qa3", "qa3","jdbc:mysql://172.17.5.14:32659/", "qa", "qatest"),
     TEST1("test1", "test1","jdbc:mysql://172.17.5.14:31548/", "qa", "qatest"),
     XJFQ("xjfq", "xjfq", "jdbc:mysql://172.17.5.2:32188/", "qa", "qatest"),
-    XYQB("xyqb", "xyqb","jdbc:mysql://172.17.5.5:32556/", "qa", "qatest");
+    XYQB("xyqb", "xyqb","jdbc:mysql://172.17.5.5:32556/", "qa", "qatest"),
+    FE("fe", "fe", "jdbc:mysql://172.17.5.9:31024/", "qa", "qatest");
 
     private String key;
     private String desc;

src/main/java/cn/quantgroup/qaplatform/dao/BasicLoanStatusDataMapper.java

@@ -46,4 +46,10 @@ public interface BasicLoanStatusDataMapper {
      * @return
      */
     List<String> getLoanStatusUserIdList(Integer status);
+
+    /**
+     * 获取多订单用例id列表
+     * @return
+     */
+    List<String> getMultiOrderUserIdList();
 }

src/main/java/cn/quantgroup/qaplatform/service/BasicLoanStatusDataService.java

@@ -49,4 +49,9 @@ public interface BasicLoanStatusDataService {
      * 获取不同放款状态的用户
      */
     List<String> getLoanStatusUserIdList(String namespace, Integer status);
+
+    /**
+     * 获取多订单用户信息列表
+     */
+    List<String> getMultiOrderUserDataList(String namespace);
 }

src/main/java/cn/quantgroup/qaplatform/service/impl/BasicLoanStatusDataServiceImpl.java

@@ -18,7 +18,7 @@ import java.util.Map;
 public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataService {
 
     @Autowired
-    BasicLoanStatusDataMapper loanStatusDataMapper;
+    BasicLoanStatusDataMapper basicLoanStatusDataMapper;
     /**
      * 获取所有用户状态
      * @return 用户状态列表
@@ -59,7 +59,7 @@ public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataServic
     @Override
     public List<LoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        return loanStatusDataMapper.getUserDataListByUuidList(uuidList);
+        return basicLoanStatusDataMapper.getUserDataListByUuidList(uuidList);
     }
 
     /**
@@ -69,7 +69,7 @@ public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataServic
     @Override
     public List<String> getUnApplyUserUuidList(String namespace) {
         SwitchDataSource.dataSourceSwitch(namespace, "business_flow");
-        return loanStatusDataMapper.getUnApplyLoanUserUuidList();
+        return basicLoanStatusDataMapper.getUnApplyLoanUserUuidList();
     }
 
     /**
@@ -80,7 +80,7 @@ public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataServic
     @Override
     public boolean queryIfPhoneExist(String namespace, String phone) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        if (loanStatusDataMapper.queryIfPhoneExist(phone) != null) {
+        if (basicLoanStatusDataMapper.queryIfPhoneExist(phone) != null) {
             return true;
         }
         return false;
@@ -96,13 +96,13 @@ public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataServic
     public List<String> getAuditStatusUserIdList(String namespace, Integer status) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
         if (status == 0) {
-            return loanStatusDataMapper.getAuditStatusUserIdList(0);
+            return basicLoanStatusDataMapper.getAuditStatusUserIdList(0);
         }
         if (status == 1) {
-            return loanStatusDataMapper.getAuditStatusUserIdList(2);
+            return basicLoanStatusDataMapper.getAuditStatusUserIdList(2);
         }
         if (status == 2) {
-            return loanStatusDataMapper.getAuditStatusUserIdList(1);
+            return basicLoanStatusDataMapper.getAuditStatusUserIdList(1);
         }
         return null;
     }
@@ -116,7 +116,7 @@ public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataServic
     @Override
     public List<LoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        List<LoanUser> result = loanStatusDataMapper.getUserDataListByUserIdList(userIdList);
+        List<LoanUser> result = basicLoanStatusDataMapper.getUserDataListByUserIdList(userIdList);
         return result;
     }
 
@@ -130,14 +130,25 @@ public class BasicLoanStatusDataServiceImpl implements BasicLoanStatusDataServic
     public List<String> getLoanStatusUserIdList(String namespace, Integer status) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
         if (status == 0) {
-            return loanStatusDataMapper.getLoanStatusUserIdList(20);
+            return basicLoanStatusDataMapper.getLoanStatusUserIdList(20);
         }
         if (status == 1) {
-            return loanStatusDataMapper.getLoanStatusUserIdList(15);
+            return basicLoanStatusDataMapper.getLoanStatusUserIdList(15);
         }
         if (status == 2) {
-            return loanStatusDataMapper.getLoanStatusUserIdList(23);
+            return basicLoanStatusDataMapper.getLoanStatusUserIdList(23);
         }
         return null;
     }
+
+    /**
+     * 获取多订单用户列表
+     * @param namespace
+     * @return
+     */
+    @Override
+    public List<String> getMultiOrderUserDataList(String namespace) {
+        SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
+        return basicLoanStatusDataMapper.getMultiOrderUserIdList();
+    }
 }

src/main/java/cn/quantgroup/qaplatform/service/impl/LoadUserDataServiceImpl.java

@@ -138,6 +138,20 @@ public class LoadUserDataServiceImpl implements LoanUserDataService {
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }
+        /**
+         * 8-多订单未申请
+         */
+        if (status == 8) {
+            List<String> userIdList = basicLoanStatusDataService.getMultiOrderUserDataList(namespace);
+            if (userIdList.isEmpty()) {
+                return null;
+            }
+            PageHelper.startPage(pageNum, pageSize);
+            result = basicLoanStatusDataService.getUserDataListByUserIdList(namespace, userIdList);
+            PageInfo<LoanUser> pageList = new PageInfo<>(result);
+            PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
+            return pageResult;
+        }
         return null;
     }
 

src/main/resources/mapper/BasicLoanStatusDataMapper.xml

@@ -48,4 +48,15 @@
         </where>
     </select>
 
+    <!-- 获取多订单用户列表 -->
+    <select id="getMultiOrderUserIdList" resultType="java.lang.String">
+        SELECT `user_id` FROM loan_application_history
+        <where>
+            `progress` = 15 or
+            `progress` = 16
+        </where>
+        GROUP BY `user_id`
+        HAVING COUNT(DISTINCT created_from)>1
+    </select>
+
 </mapper>
\ No newline at end of file