修改项目结构

src/main/java/cn/qg/qaplatform/stools/controller/JenkinsBuildController.java

 package cn.qg.qaplatform.stools.controller;
 
 import cn.qg.qaplatform.stools.utils.JenkinsApi;
-import cn.qg.qaplatform.stools.vo.BuildInfo;
+import cn.qg.qaplatform.stools.vo.JenkinsBuildInfo;
 import cn.qg.qaplatform.utils.JsonResult;
 import com.offbytwo.jenkins.model.Build;
 import org.springframework.web.bind.annotation.*;
@@ -35,18 +35,18 @@ public class JenkinsBuildController {
         } else {
             buildList = jenkinsApi.getJobBuildList(jobName, num, project);
         }
-        List<BuildInfo> buildInfoList = new ArrayList<>();
+        List<JenkinsBuildInfo> jenkinsBuildInfoList = new ArrayList<>();
         for (Build build: buildList) {
-            BuildInfo buildInfo = new BuildInfo();
-            buildInfo.setProject(build.details().getParameters().get("GIT_REPO"));
-            buildInfo.setBranch(build.details().getParameters().get("BRANCH_NAME"));
-            buildInfo.setNamespace(build.details().getParameters().get("NAMESPACE"));
-            buildInfo.setUserName(build.details().getCauses().get(0).getUserName());
-            buildInfo.setResult(build.details().getResult().toString());
-            buildInfo.setCreateAt(new Date(build.details().getTimestamp()));
-            buildInfoList.add(buildInfo);
+            JenkinsBuildInfo jenkinsBuildInfo = new JenkinsBuildInfo();
+            jenkinsBuildInfo.setProject(build.details().getParameters().get("GIT_REPO"));
+            jenkinsBuildInfo.setBranch(build.details().getParameters().get("BRANCH_NAME"));
+            jenkinsBuildInfo.setNamespace(build.details().getParameters().get("NAMESPACE"));
+            jenkinsBuildInfo.setUserName(build.details().getCauses().get(0).getUserName());
+            jenkinsBuildInfo.setResult(build.details().getResult().toString());
+            jenkinsBuildInfo.setCreateAt(new Date(build.details().getTimestamp()));
+            jenkinsBuildInfoList.add(jenkinsBuildInfo);
         }
-        return JsonResult.success(buildInfoList);
+        return JsonResult.success(jenkinsBuildInfoList);
     }
 
     /**

src/main/java/cn/qg/qaplatform/zdata/controller/KdspDecryptController.java → src/main/java/cn/qg/qaplatform/stools/controller/KdspDecryptController.java

-package cn.qg.qaplatform.zdata.controller;
+package cn.qg.qaplatform.stools.controller;
 
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.utils.AESUtil;
-import cn.qg.qaplatform.zdata.utils.RSA;
-import cn.qg.qaplatform.zdata.vo.EncryptRequest;
+import cn.qg.qaplatform.stools.utils.kdsp.AESUtil;
+import cn.qg.qaplatform.stools.utils.kdsp.RSA;
+import cn.qg.qaplatform.stools.vo.EncryptRequest;
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/cn/qg/qaplatform/stools/utils/JenkinsApi.java

 package cn.qg.qaplatform.stools.utils;
 
-import cn.qg.qaplatform.stools.vo.BuildInfo;
 import com.offbytwo.jenkins.JenkinsServer;
-import com.offbytwo.jenkins.client.JenkinsHttpClient;
-import com.offbytwo.jenkins.helper.Range;
 import com.offbytwo.jenkins.model.*;
 
 import java.io.IOException;
@@ -11,6 +8,9 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
 
+/**
+ * 操作Jenkins的api
+ */
 public class JenkinsApi {
     // Jenkins 对象
     private JenkinsServer jenkinsServer;

src/main/java/cn/qg/qaplatform/zdata/utils/AESUtil.java → src/main/java/cn/qg/qaplatform/stools/utils/kdsp/AESUtil.java

-package cn.qg.qaplatform.zdata.utils;
+package cn.qg.qaplatform.stools.utils.kdsp;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;

src/main/java/cn/qg/qaplatform/zdata/utils/ConfigureEncryptAndDecrypt.java → src/main/java/cn/qg/qaplatform/stools/utils/kdsp/ConfigureEncryptAndDecrypt.java

-package cn.qg.qaplatform.zdata.utils;
+package cn.qg.qaplatform.stools.utils.kdsp;
 
 public class ConfigureEncryptAndDecrypt {
     public static final String CHAR_ENCODING = "UTF-8";

src/main/java/cn/qg/qaplatform/zdata/utils/RSA.java → src/main/java/cn/qg/qaplatform/stools/utils/kdsp/RSA.java

-package cn.qg.qaplatform.zdata.utils;
+package cn.qg.qaplatform.stools.utils.kdsp;
 
 import java.security.Key;
 import java.security.KeyFactory;

src/main/java/cn/qg/qaplatform/zdata/vo/EncryptRequest.java → src/main/java/cn/qg/qaplatform/stools/vo/EncryptRequest.java

-package cn.qg.qaplatform.zdata.vo;
+package cn.qg.qaplatform.stools.vo;
 
 import lombok.Data;
 
 import java.io.Serializable;
 
+/**
+ * kdsp提交订单加密相关
+ */
 @Data
 public class EncryptRequest implements Serializable {
 
@@ -20,4 +23,3 @@ public class EncryptRequest implements Serializable {
      */
     private String decBody;
 }
-

src/main/java/cn/qg/qaplatform/stools/vo/BuildInfo.java → src/main/java/cn/qg/qaplatform/stools/vo/JenkinsBuildInfo.java

@@ -4,8 +4,11 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * Jenkins 构建信息
+ */
 @Data
-public class BuildInfo {
+public class JenkinsBuildInfo {
     public String namespace;
     public String project;
     public String branch;

src/main/java/cn/qg/qaplatform/zdata/controller/GenVccController.java → src/main/java/cn/qg/qaplatform/zdata/controller/vcc/VccGenController.java

-package cn.qg.qaplatform.zdata.controller;
+package cn.qg.qaplatform.zdata.controller.vcc;
 
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.entity.GenVccUser;
-import cn.qg.qaplatform.zdata.service.VccDataService;
+import cn.qg.qaplatform.zdata.entity.VccOpenResultVo;
+import cn.qg.qaplatform.zdata.service.vcc.VccDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("vcc")
 @Api(tags = "vcc造数据")
-public class GenVccController {
+public class VccGenController {
 
     @Autowired
     VccDataService vccDataService;
@@ -29,7 +29,7 @@ public class GenVccController {
         if (!channel.equals("214") && !channel.equals("217")) {
             return JsonResult.clientFailed("渠道必须为214或217");
         }
-        GenVccUser result = vccDataService.makeVccUser(namespace, phoneNo, channel, status);
+        VccOpenResultVo result = vccDataService.makeVccUser(namespace, phoneNo, channel, status);
         if (result == null) {
             return JsonResult.serverFailed();
         }

src/main/java/cn/qg/qaplatform/zdata/controller/QueryVccController.java → src/main/java/cn/qg/qaplatform/zdata/controller/vcc/VccQueryController.java

-package cn.qg.qaplatform.zdata.controller;
+package cn.qg.qaplatform.zdata.controller.vcc;
 
 import cn.qg.qaplatform.utils.JsonResult;
 import cn.qg.qaplatform.zdata.enums.VccStatusEnum;
-import cn.qg.qaplatform.zdata.entity.QueryVccUser;
-import cn.qg.qaplatform.zdata.service.VccDataService;
+import cn.qg.qaplatform.zdata.entity.VccUserEntity;
+import cn.qg.qaplatform.zdata.service.vcc.VccDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@ import java.util.Map;
 @Api(tags = "vcc查询")
 @RestController
 @RequestMapping("/vcc")
-public class QueryVccController {
+public class VccQueryController {
 
     @Autowired
     VccDataService vccDataService;
@@ -32,27 +32,27 @@ public class QueryVccController {
 
     @GetMapping("/getStatus")
     public JsonResult getUserStatus(String namespace, String phoneNo) {
-        QueryVccUser queryVccUser = vccDataService.queryUserVccStatus(namespace, phoneNo);
-        if (queryVccUser == null) {
+        VccUserEntity vccUserEntity = vccDataService.queryUserVccStatus(namespace, phoneNo);
+        if (vccUserEntity == null) {
             return JsonResult.serverFailed("该用户不存在！");
         }
-        return JsonResult.success(queryVccUser);
+        return JsonResult.success(vccUserEntity);
     }
 
     @GetMapping("/checkData")
     public JsonResult checkUserData(String namespace, String phoneNo, String idCardNo) {
-        QueryVccUser queryVccUser = vccDataService.queryUserVccStatus(namespace, phoneNo);
-        if (queryVccUser == null) {
+        VccUserEntity vccUserEntity = vccDataService.queryUserVccStatus(namespace, phoneNo);
+        if (vccUserEntity == null) {
             return JsonResult.serverFailed("该用户不存在！");
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("phoneNo", queryVccUser.getPhoneNo());
-        map.put("userId", queryVccUser.getUserId());
-        map.put("uuid", queryVccUser.getUuid());
-        map.put("registeredFrom", queryVccUser.getRegisteredFrom());
-        map.put("nextApplyTime", queryVccUser.getNextApplyTime());
-        map.put("createdAt", queryVccUser.getCreatedAt());
-        map.put("status", VccStatusEnum.getDescByCode(queryVccUser.getStatus()));
+        map.put("phoneNo", vccUserEntity.getPhoneNo());
+        map.put("userId", vccUserEntity.getUserId());
+        map.put("uuid", vccUserEntity.getUuid());
+        map.put("registeredFrom", vccUserEntity.getRegisteredFrom());
+        map.put("nextApplyTime", vccUserEntity.getNextApplyTime());
+        map.put("createdAt", vccUserEntity.getCreatedAt());
+        map.put("status", VccStatusEnum.getDescByCode(vccUserEntity.getStatus()));
         return JsonResult.success(map);
     }
 }

src/main/java/cn/qg/qaplatform/zdata/controller/GenLoanUserDataController.java → src/main/java/cn/qg/qaplatform/zdata/controller/xyqb/XyqbGenController.java

-package cn.qg.qaplatform.zdata.controller;
+package cn.qg.qaplatform.zdata.controller.xyqb;
 
 import cn.qg.qaplatform.utils.JsonResult;
 import cn.qg.qaplatform.zdata.enums.ChannelEnum;
 import cn.qg.qaplatform.zdata.enums.FundEnum;
-import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
-import cn.qg.qaplatform.zdata.entity.GenLoanUser;
-import cn.qg.qaplatform.zdata.service.LexinDataService;
-import cn.qg.qaplatform.zdata.service.XyqbDataService;
-import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
+import cn.qg.qaplatform.zdata.service.xyqb.LexinDataService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbGenDataService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
 import cn.qg.qaplatform.utils.EnumUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,29 +21,29 @@ import java.util.Map;
 
 @RestController
 @CrossOrigin
-@RequestMapping("/gen")
+@RequestMapping("/xyqb/gen")
 @Api(tags = "造数据相关接口")
-public class GenLoanUserDataController {
+public class XyqbGenController {
 
     @Autowired
-    XyqbDataService xyqbDataService;
+    XyqbGenDataService xyqbGenDataService;
 
     @Autowired
     LexinDataService lexinDataService;
 
     @Autowired
-    QueryBasicLoanStatusDataService queryBasicLoanStatusDataService;
+    XyqbBasicQueryService xyqbBasicQueryService;
 
     @ApiOperation(value = "造数据接口")
     @PostMapping("/data")
-    public JsonResult genLoanUserData(@RequestBody ApplyDataVo applyDataVo) throws Exception {
+    public JsonResult genLoanUserData(@RequestBody XyqbApplyDataVo xyqbApplyDataVo) throws Exception {
         boolean result = false;
-        if (applyDataVo.getChannel().equals(ChannelEnum.XYQB.getChannelId())) {
-            result = xyqbDataService.genLoanUser(applyDataVo);
-        }
-        if (applyDataVo.getChannel().equals(ChannelEnum.LEXIN.getChannelId())) {
-            result = lexinDataService.genLexinData(applyDataVo);
+        if (xyqbApplyDataVo.getChannel().equals(ChannelEnum.XYQB.getChannelId())) {
+            result = xyqbGenDataService.genLoanUser(xyqbApplyDataVo);
         }
+//        if (xyqbApplyDataVo.getChannel().equals(ChannelEnum.LEXIN.getChannelId())) {
+//            result = lexinDataService.genLexinData(xyqbApplyDataVo);
+//        }
         return JsonResult.success(result);
     }
 
@@ -62,8 +62,8 @@ public class GenLoanUserDataController {
     @GetMapping("/userStatus")
     public JsonResult queryUserStatus(@RequestParam String namespace,
                                       @RequestParam String phoneNo) {
-        GenLoanUser genLoanUser = xyqbDataService.queryUserStatus(namespace, phoneNo);
-        return JsonResult.success(genLoanUser);
+        XjfqGenProcessVo xjfqGenProcessVo = xyqbGenDataService.queryUserStatus(namespace, phoneNo);
+        return JsonResult.success(xjfqGenProcessVo);
     }
 
     @GetMapping("/channelMappedFund")

src/main/java/cn/qg/qaplatform/zdata/controller/QueryLoanUserDataController.java → src/main/java/cn/qg/qaplatform/zdata/controller/xyqb/XyqbQueryController.java

-package cn.qg.qaplatform.zdata.controller;
+package cn.qg.qaplatform.zdata.controller.xyqb;
 
-import cn.qg.qaplatform.zdata.service.QueryLoanUserDataService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbQueryService;
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,15 +16,15 @@ import java.util.Map;
 
 @CrossOrigin
 @RestController
-@RequestMapping("query")
+@RequestMapping("/xyqb/query")
 @Api(tags = "捞数据相关接口")
-public class QueryLoanUserDataController {
+public class XyqbQueryController {
 
     @Autowired
-    private QueryBasicLoanStatusDataService basicLoanStatusDataService;
+    private XyqbBasicQueryService basicLoanStatusDataService;
 
     @Autowired
-    private QueryLoanUserDataService loanUserDataService;
+    private XyqbQueryService loanUserDataService;
 
     /**
      * @return 获取所有借款用户状态

src/main/java/cn/qg/qaplatform/zdata/entity/GenVccUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/VccOpenResultVo.java

@@ -2,8 +2,11 @@ package cn.qg.qaplatform.zdata.entity;
 
 import lombok.Data;
 
+/**
+ * vcc造数据结果页信息
+ */
 @Data
-public class GenVccUser {
+public class VccOpenResultVo {
     /**
      * 手机号
      */

src/main/java/cn/qg/qaplatform/zdata/entity/QueryVccUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/VccUserEntity.java

@@ -8,27 +8,27 @@ import java.util.Date;
  * 捞数据返回的享花卡用户实体类
  */
 @Data
-public class QueryVccUser {
-    public String phoneNo;
+public class VccUserEntity {
+    private String phoneNo;
 
-    public String userId;
+    private String userId;
 
-    public String uuid;
+    private String uuid;
 
     /**
      * 注册渠道
      */
-    public Long registeredFrom;
+    private Long registeredFrom;
 
     /**
      * 过期时间
      */
-    public Date nextApplyTime;
+    private Date nextApplyTime;
 
     /**
      * 创建时间
      */
-    public Date createdAt;
+    private Date createdAt;
 
     /**
      * CREATED("初始状态"), // 0
@@ -40,5 +40,10 @@ public class QueryVccUser {
      * XYQB_OPEN_SUCC("信用钱包开户成功"), // 6
      * XYQB_OPEN_FAILED("信用钱包开户失败"), // 7
      */
-    public Integer status;
+    private Integer status;
+
+    /**
+     * 账号类别：vcc/scacard/xyqb_mall'
+     */
+    private String type;
 }

src/main/java/cn/qg/qaplatform/zdata/entity/GenLoanUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/XjfqGenProcessVo.java

@@ -4,8 +4,11 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 现金分期造数据过程中
+ */
 @Data
-public class GenLoanUser {
+public class XjfqGenProcessVo {
     /**
      * 手机号
      */

src/main/java/cn/qg/qaplatform/zdata/entity/QueryLoanUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/XjfqUserEntity.java

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

src/main/java/cn/qg/qaplatform/zdata/entity/ApplyDataVo.java → src/main/java/cn/qg/qaplatform/zdata/entity/XyqbApplyDataVo.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
  * 造数据传递的参数实体类
  */
 @Data
-public class ApplyDataVo {
+public class XyqbApplyDataVo {
 
     @NotNull(message = "借款状态不能为空！")
     private Integer status;

src/main/java/cn/qg/qaplatform/zdata/enums/ChannelEnum.java

@@ -5,8 +5,8 @@ package cn.qg.qaplatform.zdata.enums;
  */
 public enum ChannelEnum {
 
-    XYQB("信用钱包", 1),
-    LEXIN("乐信", 159886);
+    XYQB("信用钱包", 1);
+//    LEXIN("乐信", 159886);
 
     private String name;
     private Integer channelId;

src/main/java/cn/qg/qaplatform/zdata/enums/FundEnum.java

@@ -7,8 +7,8 @@ public enum FundEnum {
 
     GYXD("广达小贷", 480),
     YNXT("云南信托", 1040),
-    PDSB("平顶山银行", 1030),
-    GDLX("广达乐信",1010);
+    PDSB("平顶山银行", 1030);
+//    GDLX("广达乐信",1010);
 
     private String name;
     private Integer fundId;

src/main/java/cn/qg/qaplatform/zdata/mapper/QueryVccDataMapper.java → src/main/java/cn/qg/qaplatform/zdata/mapper/VccDataMapper.java

 package cn.qg.qaplatform.zdata.mapper;
 
-import cn.qg.qaplatform.zdata.entity.QueryVccUser;
+import cn.qg.qaplatform.zdata.entity.VccUserEntity;
 
 import java.util.List;
 
-public interface QueryVccDataMapper {
+public interface VccDataMapper {
     /**
      * 根据状态获取vcc用户
      */
-    List<QueryVccUser> queryVccDataByStatus(Integer status);
+    List<VccUserEntity> queryVccDataByStatus(Integer status);
 
     /**
      * 查看用户vcc状态
      */
-    QueryVccUser queryUserVccStatus(String phoneNo);
+    VccUserEntity queryUserVccStatus(String phoneNo);
 }

src/main/java/cn/qg/qaplatform/zdata/mapper/QueryBasicLoanStatusDataMapper.java → src/main/java/cn/qg/qaplatform/zdata/mapper/XyqbLoanDataMapper.java

 package cn.qg.qaplatform.zdata.mapper;
 
 
-import cn.qg.qaplatform.zdata.entity.GenLoanUser;
-import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
+import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
+import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface QueryBasicLoanStatusDataMapper {
+public interface XyqbLoanDataMapper {
 
     /**
      * 根据uuidList获取用户数据信息
      * @param uuidList
      * @return
      */
-    List<QueryLoanUser> getUserDataListByUuidList(List<String> uuidList);
+    List<XjfqUserEntity> getUserDataListByUuidList(List<String> uuidList);
 
     /**
      * 获取未申请用户数据uuidList
@@ -32,7 +32,7 @@ public interface QueryBasicLoanStatusDataMapper {
      * @param userIdList
      * @return
      */
-    List<QueryLoanUser> getUserDataListByUserIdList(List<String> userIdList);
+    List<XjfqUserEntity> getUserDataListByUserIdList(List<String> userIdList);
 
     /**
      * 根据审核状态获取用户Id列表
@@ -69,7 +69,7 @@ public interface QueryBasicLoanStatusDataMapper {
      */
     Integer getAssignFundIdByUserId(String userId);
 
-    GenLoanUser getUserInfoByPhoneNo(String phoneNo);
+    XjfqGenProcessVo getUserInfoByPhoneNo(String phoneNo);
 
     Integer getLoanProgressByUserId(String userId);
 }

src/main/java/cn/qg/qaplatform/zdata/process/Lexin.java

 package cn.qg.qaplatform.zdata.process;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
 import cn.qg.qaplatform.zdata.Encrypt.LexinEncrypt;
 import cn.qg.qaplatform.utils.HttpClientUtils;
 import com.alibaba.fastjson.JSONObject;
@@ -24,17 +24,17 @@ public class Lexin {
     /**
      * 进件
      */
-    public static boolean createOrder(ApplyDataVo applyDataVo) {
-        String namespace = applyDataVo.getNamespace();
-        String phoneNo = applyDataVo.getPhoneNo();
-        String userName = applyDataVo.getName();
-        String idCardNo = applyDataVo.getIdCardNo();
-        Integer amount = applyDataVo.getAmount();
-        Integer term = applyDataVo.getTerm();
-        String rate = applyDataVo.getRate();
-        String fixedBillDay = applyDataVo.getFixedBillDay();
-        String fixedRepayDay = applyDataVo.getFixedRepayDay();
-        String symbol = applyDataVo.getSymbol();
+    public static boolean createOrder(XyqbApplyDataVo xyqbApplyDataVo) {
+        String namespace = xyqbApplyDataVo.getNamespace();
+        String phoneNo = xyqbApplyDataVo.getPhoneNo();
+        String userName = xyqbApplyDataVo.getName();
+        String idCardNo = xyqbApplyDataVo.getIdCardNo();
+        Integer amount = xyqbApplyDataVo.getAmount();
+        Integer term = xyqbApplyDataVo.getTerm();
+        String rate = xyqbApplyDataVo.getRate();
+        String fixedBillDay = xyqbApplyDataVo.getFixedBillDay();
+        String fixedRepayDay = xyqbApplyDataVo.getFixedRepayDay();
+        String symbol = xyqbApplyDataVo.getSymbol();
 
         String orderNo = "channel_order" + phoneNo + "_" + random.nextInt(9999);
         String url = "http://qapi-" + namespace + ".liangkebang.net/ex/api/v2/applyLoan/LEXIN";

src/main/java/cn/qg/qaplatform/zdata/service/RuleEngineService.java → src/main/java/cn/qg/qaplatform/zdata/service/risk/RuleEngineService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.risk;
 
 /**
- * 风控相关接口
+ * 风控相关服务
  */
 public interface RuleEngineService {
     /**

src/main/java/cn/qg/qaplatform/zdata/service/impl/RuleEngineServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/risk/impl/RuleEngineServiceImpl.java

-package cn.qg.qaplatform.zdata.service.impl;
+package cn.qg.qaplatform.zdata.service.risk.impl;
 
 import cn.qg.qaplatform.config.SwitchDataSource;
 import cn.qg.qaplatform.zdata.mapper.RuleEngineMapper;
-import cn.qg.qaplatform.zdata.service.RuleEngineService;
+import cn.qg.qaplatform.zdata.service.risk.RuleEngineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+/**
+ * 风控相关服务
+ */
 @Service
 public class RuleEngineServiceImpl implements RuleEngineService {
 
     @Autowired
     RuleEngineMapper ruleEngineMapper;
 
+    /**
+     * 添加授信黑名单
+     * @param uuid uuid
+     * @return 成功与否
+     */
     @Override
     public boolean addBlackList(String uuid) {
         SwitchDataSource.dataSourceSwitch("fe", "workflow");

src/main/java/cn/qg/qaplatform/zdata/service/VccDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/vcc/VccDataService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.vcc;
 
-import cn.qg.qaplatform.zdata.entity.GenVccUser;
-import cn.qg.qaplatform.zdata.entity.QueryVccUser;
+import cn.qg.qaplatform.zdata.entity.VccOpenResultVo;
+import cn.qg.qaplatform.zdata.entity.VccUserEntity;
 import cn.qg.qaplatform.utils.page.PageResult;
 
 
@@ -10,9 +10,18 @@ import cn.qg.qaplatform.utils.page.PageResult;
  * @author libo
  */
 public interface VccDataService {
-    GenVccUser makeVccUser(String namespace, String phoneNo, String openedChannel, Integer status) throws Exception;
+    /**
+     * vcc造数据
+     */
+    VccOpenResultVo makeVccUser(String namespace, String phoneNo, String openedChannel, Integer status) throws Exception;
 
+    /**
+     * 根据状态批量获取vcc数据
+     */
     PageResult getVccData(String namespace, Integer status, Integer pageNum, Integer pageSize);
 
-    QueryVccUser queryUserVccStatus(String namespace, String phoneNo);
+    /**
+     * 根据手机号获取用户vcc状态
+     */
+    VccUserEntity queryUserVccStatus(String namespace, String phoneNo);
 }

src/main/java/cn/qg/qaplatform/zdata/service/impl/VccDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/vcc/impl/VccDataServiceImpl.java

-package cn.qg.qaplatform.zdata.service.impl;
+package cn.qg.qaplatform.zdata.service.vcc.impl;
 
 import cn.qg.qaplatform.config.SwitchDataSource;
 import cn.qg.qaplatform.zdata.enums.VccStatusEnum;
-import cn.qg.qaplatform.zdata.mapper.QueryVccDataMapper;
-import cn.qg.qaplatform.zdata.entity.GenVccUser;
-import cn.qg.qaplatform.zdata.entity.QueryVccUser;
+import cn.qg.qaplatform.zdata.mapper.VccDataMapper;
+import cn.qg.qaplatform.zdata.entity.VccOpenResultVo;
+import cn.qg.qaplatform.zdata.entity.VccUserEntity;
 import cn.qg.qaplatform.zdata.process.Vcc;
-import cn.qg.qaplatform.zdata.service.RuleEngineService;
-import cn.qg.qaplatform.zdata.service.VccDataService;
+import cn.qg.qaplatform.zdata.service.risk.RuleEngineService;
+import cn.qg.qaplatform.zdata.service.vcc.VccDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import cn.qg.qaplatform.utils.page.PageUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +26,7 @@ import java.util.Map;
 public class VccDataServiceImpl implements VccDataService {
 
     @Autowired
-    QueryVccDataMapper queryVccDataMapper;
+    VccDataMapper vccDataMapper;
 
     @Autowired
     RuleEngineService ruleEngineService;
@@ -41,10 +41,10 @@ public class VccDataServiceImpl implements VccDataService {
      * @throws Exception
      */
     @Override
-    public GenVccUser makeVccUser(String namespace, String phoneNo, String openedChannel, Integer status) throws Exception {
-        GenVccUser genVccUser = new GenVccUser();
-        genVccUser.setPhoneNo(phoneNo);
-        genVccUser.setOpenedChannel(openedChannel);
+    public VccOpenResultVo makeVccUser(String namespace, String phoneNo, String openedChannel, Integer status) throws Exception {
+        VccOpenResultVo vccOpenResultVo = new VccOpenResultVo();
+        vccOpenResultVo.setPhoneNo(phoneNo);
+        vccOpenResultVo.setOpenedChannel(openedChannel);
         String vccChannel = null;
         if (openedChannel.equals("214")) {
             vccChannel = "159904";
@@ -67,8 +67,8 @@ public class VccDataServiceImpl implements VccDataService {
         // 检查用户是否已有额度
         boolean haveQuota = Vcc.checkIfAlreadyHaveQuota(namespace, uuid);
         if (haveQuota) {
-            genVccUser.setMsg("该用户已申请过，请更换新用户申请！");
-            return genVccUser;
+            vccOpenResultVo.setMsg("该用户已申请过，请更换新用户申请！");
+            return vccOpenResultVo;
         }
         // credit url
         String vccToken = Vcc.creditUrl(namespace, token, vccChannel);
@@ -109,9 +109,9 @@ public class VccDataServiceImpl implements VccDataService {
         if (status == 1 || status == 2) {
             log.info("提交授信成功！");
             Thread.sleep(2000);
-            QueryVccUser userInfo = queryUserVccStatus(namespace, phoneNo);
-            genVccUser.setMsg(VccStatusEnum.getDescByCode(userInfo.getStatus()));
-            return genVccUser;
+            VccUserEntity userInfo = queryUserVccStatus(namespace, phoneNo);
+            vccOpenResultVo.setMsg(VccStatusEnum.getDescByCode(userInfo.getStatus()));
+            return vccOpenResultVo;
         }
         // 人脸识别回调
         Vcc.appFaceCallback(namespace, token, vccChannel);
@@ -127,19 +127,19 @@ public class VccDataServiceImpl implements VccDataService {
             Map data = (Map) result.get("data");
             String amount = data.get("amount").toString();
             String eacctNo = data.get("eacctNo").toString();
-            genVccUser.setAmount(amount);
-            genVccUser.setEacctNo(eacctNo);
-            genVccUser.setMsg("开户成功");
+            vccOpenResultVo.setAmount(amount);
+            vccOpenResultVo.setEacctNo(eacctNo);
+            vccOpenResultVo.setMsg("开户成功");
         }
         if (status == 4) {
             Map data = (Map) quotaActivationResult.get("data");
             if (data.get("status").equals("2")) {
-                genVccUser.setMsg("开户失败");
+                vccOpenResultVo.setMsg("开户失败");
             } else {
-                genVccUser.setMsg("请找开发手动设置结果为开户失败！");
+                vccOpenResultVo.setMsg("请找开发手动设置结果为开户失败！");
             }
         }
-        return genVccUser;
+        return vccOpenResultVo;
     }
 
     /**
@@ -152,8 +152,8 @@ public class VccDataServiceImpl implements VccDataService {
     public PageResult getVccData(String namespace, Integer status, Integer pageNum, Integer pageSize) {
         SwitchDataSource.dataSourceSwitch(namespace, "vcc_talos");
         PageHelper.startPage(pageNum, pageSize);
-        List<QueryVccUser> result =  queryVccDataMapper.queryVccDataByStatus(status);
-        PageInfo<QueryVccUser> pageList = new PageInfo<>(result);
+        List<VccUserEntity> result =  vccDataMapper.queryVccDataByStatus(status);
+        PageInfo<VccUserEntity> pageList = new PageInfo<>(result);
         PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
         return pageResult;
     }
@@ -165,8 +165,8 @@ public class VccDataServiceImpl implements VccDataService {
      * @return QueryVccUser实体
      */
     @Override
-    public QueryVccUser queryUserVccStatus(String namespace, String phoneNo) {
+    public VccUserEntity queryUserVccStatus(String namespace, String phoneNo) {
         SwitchDataSource.dataSourceSwitch(namespace, "vcc_talos");
-        return queryVccDataMapper.queryUserVccStatus(phoneNo);
+        return vccDataMapper.queryUserVccStatus(phoneNo);
     }
 }

src/main/java/cn/qg/qaplatform/zdata/service/LexinDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/LexinDataService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.xyqb;
 
-import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
 
 /**
  * 乐信数据
@@ -8,5 +8,5 @@ import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
  */
 public interface LexinDataService {
 
-    boolean genLexinData(ApplyDataVo applyDataVo) throws Exception;
+    boolean genLexinData(XyqbApplyDataVo xyqbApplyDataVo) throws Exception;
 }

src/main/java/cn/qg/qaplatform/zdata/service/QueryInProcessStatusService.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/QueryInProcessStatusService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.xyqb;
 
 /**
  * 查询造数据流程中的状态

src/main/java/cn/qg/qaplatform/zdata/service/QueryBasicLoanStatusDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/XyqbBasicQueryService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.xyqb;
 
-import cn.qg.qaplatform.zdata.entity.GenLoanUser;
-import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
+import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
+import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * 单个状态数据查询
  */
-public interface QueryBasicLoanStatusDataService {
+public interface XyqbBasicQueryService {
     /**
      * 获取所有的用户状态
      */
@@ -23,7 +23,7 @@ public interface QueryBasicLoanStatusDataService {
     /**
      * 根据uuid获取用户信息
      */
-    List<QueryLoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList);
+    List<XjfqUserEntity> getUserDataListByUuidList(String namespace, List<String> uuidList);
 
     /**
      * 获取未申请用户
@@ -49,7 +49,7 @@ public interface QueryBasicLoanStatusDataService {
     /**
      * 根据userIdList获取用户信息列表
      */
-    List<QueryLoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList);
+    List<XjfqUserEntity> getUserDataListByUserIdList(String namespace, List<String> userIdList);
 
     /**
      * 获取不同放款状态的用户
@@ -69,7 +69,7 @@ public interface QueryBasicLoanStatusDataService {
     /**
      * 根据手机号查询用户信息
      */
-    GenLoanUser getUserInfoByPhoneNo(String namespace, String phoneNo);
+    XjfqGenProcessVo getUserInfoByPhoneNo(String namespace, String phoneNo);
 
     /**
      * 根据userId获取用户放款状态

src/main/java/cn/qg/qaplatform/zdata/service/XyqbDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/XyqbGenDataService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.xyqb;
 
-import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
-import cn.qg.qaplatform.zdata.entity.GenLoanUser;
+import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
 
 import java.io.IOException;
 
-public interface XyqbDataService {
+public interface XyqbGenDataService {
 
     /**
      * 分配资金方
@@ -14,32 +14,32 @@ public interface XyqbDataService {
 
     /**
      * 授信
-     * @param applyDataVo 造数据的相关信息
+     * @param xyqbApplyDataVo 造数据的相关信息
      * @return 成功或失败
      */
-    boolean quotaAuth(ApplyDataVo applyDataVo, boolean auditResult) throws Exception;
+    boolean quotaAuth(XyqbApplyDataVo xyqbApplyDataVo, boolean auditResult) throws Exception;
 
     /**
      * 提现
-     * @param applyDataVo 造数据相关信息
+     * @param xyqbApplyDataVo 造数据相关信息
      * @return 成功或失败
      */
-    boolean withDraw(ApplyDataVo applyDataVo, boolean auditResult) throws Exception;
+    boolean withDraw(XyqbApplyDataVo xyqbApplyDataVo, boolean auditResult) throws Exception;
 
     /**
      * 放款
-     * @param applyDataVo
+     * @param xyqbApplyDataVo
      * @return
      */
-    boolean makeLoan(ApplyDataVo applyDataVo, boolean payStatus) throws Exception;
+    boolean makeLoan(XyqbApplyDataVo xyqbApplyDataVo, boolean payStatus) throws Exception;
 
     /**
      * 造数据
-     * @param applyDataVo
+     * @param xyqbApplyDataVo
      * @return
      * @throws Exception
      */
-    boolean genLoanUser(ApplyDataVo applyDataVo) throws Exception;
+    boolean genLoanUser(XyqbApplyDataVo xyqbApplyDataVo) throws Exception;
 
     /**
      * 获取用户状态
@@ -47,6 +47,6 @@ public interface XyqbDataService {
      * @param phoneNo
      * @return
      */
-    GenLoanUser queryUserStatus(String namespace, String phoneNo);
+    XjfqGenProcessVo queryUserStatus(String namespace, String phoneNo);
 
 }

src/main/java/cn/qg/qaplatform/zdata/service/QueryLoanUserDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/XyqbQueryService.java

-package cn.qg.qaplatform.zdata.service;
+package cn.qg.qaplatform.zdata.service.xyqb;
 
 import cn.qg.qaplatform.utils.page.PageResult;
 
 /**
  * 多个状态结合查询
  */
-public interface QueryLoanUserDataService {
+public interface XyqbQueryService {
     /**
      * 获取已有用户状态数据
      * @param status 用户状态

src/main/java/cn/qg/qaplatform/zdata/service/impl/LexinDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/impl/LexinDataServiceImpl.java

-package cn.qg.qaplatform.zdata.service.impl;
+package cn.qg.qaplatform.zdata.service.xyqb.impl;
 
 import cn.qg.qaplatform.zdata.enums.ChannelEnum;
-import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
 import cn.qg.qaplatform.zdata.process.Common;
 import cn.qg.qaplatform.zdata.process.Lexin;
 import cn.qg.qaplatform.zdata.process.Xyqb;
-import cn.qg.qaplatform.zdata.service.QueryInProcessStatusService;
-import cn.qg.qaplatform.zdata.service.LexinDataService;
+import cn.qg.qaplatform.zdata.service.xyqb.QueryInProcessStatusService;
+import cn.qg.qaplatform.zdata.service.xyqb.LexinDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -24,22 +24,22 @@ public class LexinDataServiceImpl implements LexinDataService {
     RedisTemplate redisTemplate;
 
     @Override
-    public boolean genLexinData(ApplyDataVo applyDataVo) throws Exception {
-        String namespace = applyDataVo.getNamespace();
-        String phoneNo = applyDataVo.getPhoneNo();
-        String bankCardNo = applyDataVo.getBankCardNo();
-        String bankCode = applyDataVo.getBankCode();
-        String bankName = applyDataVo.getBankName();
-        Integer fundId = applyDataVo.getFundId();
-        String symbol = applyDataVo.getSymbol();
-        Integer amount = applyDataVo.getAmount();
-        Integer term = applyDataVo.getTerm();
+    public boolean genLexinData(XyqbApplyDataVo xyqbApplyDataVo) throws Exception {
+        String namespace = xyqbApplyDataVo.getNamespace();
+        String phoneNo = xyqbApplyDataVo.getPhoneNo();
+        String bankCardNo = xyqbApplyDataVo.getBankCardNo();
+        String bankCode = xyqbApplyDataVo.getBankCode();
+        String bankName = xyqbApplyDataVo.getBankName();
+        Integer fundId = xyqbApplyDataVo.getFundId();
+        String symbol = xyqbApplyDataVo.getSymbol();
+        Integer amount = xyqbApplyDataVo.getAmount();
+        Integer term = xyqbApplyDataVo.getTerm();
         Xyqb.symbol = symbol;
         Common.symbol = symbol;
         // 分配资产计划
         boolean fundAssignResult = Common.assignFundCorp(namespace, fundId);
         // 进件
-        boolean createOrderResult = Lexin.createOrder(applyDataVo);
+        boolean createOrderResult = Lexin.createOrder(xyqbApplyDataVo);
         if (!createOrderResult) {
             return false;
         }
@@ -47,7 +47,8 @@ public class LexinDataServiceImpl implements LexinDataService {
         Map userInfoResult = Xyqb.checkUserId(namespace, phoneNo);
         String uuid = userInfoResult.get("uuid").toString();
         String userId = userInfoResult.get("id").toString();
-        String channelOrderNo = Common.queryChannelOrderNoByPhone(namespace, phoneNo, ChannelEnum.LEXIN.getChannelId());
+//        String channelOrderNo = Common.queryChannelOrderNoByPhone(namespace, phoneNo, ChannelEnum.LEXIN.getChannelId());
+        String channelOrderNo = Common.queryChannelOrderNoByPhone(namespace, phoneNo, 159886);
         Common.channelOrderApprove(namespace, channelOrderNo, amount, "0", true, term);
         // 风控授信回调
 //        Xyqb.creditAuthNotify(namespace, token, uuid, ChannelEnum.LEXIN.getChannelId(), fundId, channelOrderNo, 0, true, amount, term);
@@ -61,7 +62,8 @@ public class LexinDataServiceImpl implements LexinDataService {
         }
         setUserStatusRedisValue(namespace, phoneNo, 2);
         // 二次风控
-        Integer loanId = Common.queryLoanId(namespace, phoneNo, ChannelEnum.LEXIN.getChannelId());
+//        Integer loanId = Common.queryLoanId(namespace, phoneNo, ChannelEnum.LEXIN.getChannelId());
+        Integer loanId = Common.queryLoanId(namespace, phoneNo, 159886);
         boolean secondWindControlResult = Xyqb.externalQuotaOrderAuditNotify(namespace, 1, token, uuid, loanId, 11, true);
 
         Xyqb.modifyContactStatus(namespace, userId);

src/main/java/cn/qg/qaplatform/zdata/service/impl/QueryInProcessStatusServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/impl/QueryInProcessStatusServiceImpl.java

-package cn.qg.qaplatform.zdata.service.impl;
+package cn.qg.qaplatform.zdata.service.xyqb.impl;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
-import cn.qg.qaplatform.zdata.service.QueryInProcessStatusService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.zdata.service.xyqb.QueryInProcessStatusService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +13,13 @@ import org.springframework.stereotype.Service;
 public class QueryInProcessStatusServiceImpl implements QueryInProcessStatusService {
 
     @Autowired
-    QueryBasicLoanStatusDataService queryBasicLoanStatusDataService;
+    XyqbBasicQueryService xyqbBasicQueryService;
 
     @Override
     public void queryFundingAssignProgress(String namespace, String phoneNo, Integer fundId, String symbol) throws InterruptedException {
-        String userId = queryBasicLoanStatusDataService.getUserInfoByPhoneNo(namespace, phoneNo).getUserId();
+        String userId = xyqbBasicQueryService.getUserInfoByPhoneNo(namespace, phoneNo).getUserId();
         while (true) {
-            Integer searchResult = queryBasicLoanStatusDataService.getAssignFundIdByUserId(namespace, userId);
+            Integer searchResult = xyqbBasicQueryService.getAssignFundIdByUserId(namespace, userId);
             log.info(searchResult.toString());
             if (fundId.equals(searchResult)) {
                 log.info("用户：" + userId + "资方分配成功!");
@@ -38,9 +38,9 @@ public class QueryInProcessStatusServiceImpl implements QueryInProcessStatusServ
 
     @Override
     public void queryLoanProgress(String namespace, String phoneNo, String symbol) throws InterruptedException {
-        String userId = queryBasicLoanStatusDataService.getUserInfoByPhoneNo(namespace, phoneNo).getUserId();
+        String userId = xyqbBasicQueryService.getUserInfoByPhoneNo(namespace, phoneNo).getUserId();
         while (true) {
-            Integer progress = queryBasicLoanStatusDataService.getLoanProgressByUserId(namespace, userId);
+            Integer progress = xyqbBasicQueryService.getLoanProgressByUserId(namespace, userId);
             if (progress == 15) {
                 log.info("用户：" + userId + "放款成功！");
                 if (!StringUtils.isEmpty(symbol)) {

src/main/java/cn/qg/qaplatform/zdata/service/impl/QueryBasicLoanStatusDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/impl/XyqbBasicQueryServiceImpl.java

-package cn.qg.qaplatform.zdata.service.impl;
+package cn.qg.qaplatform.zdata.service.xyqb.impl;
 
 import cn.qg.qaplatform.zdata.enums.LoanStatus;
 import cn.qg.qaplatform.enums.Namespace;
-import cn.qg.qaplatform.zdata.mapper.QueryBasicLoanStatusDataMapper;
-import cn.qg.qaplatform.zdata.entity.GenLoanUser;
-import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
+import cn.qg.qaplatform.zdata.mapper.XyqbLoanDataMapper;
+import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
+import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
 import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,10 +16,10 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatusDataService {
+public class XyqbBasicQueryServiceImpl implements XyqbBasicQueryService {
 
     @Autowired
-    QueryBasicLoanStatusDataMapper basicLoanStatusDataMapper;
+    XyqbLoanDataMapper xyqbLoanDataMapper;
 
     /**
      * 获取所有用户状态
@@ -59,9 +59,9 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
      * @return
      */
     @Override
-    public List<QueryLoanUser> getUserDataListByUuidList(String namespace, List<String> uuidList) {
+    public List<XjfqUserEntity> getUserDataListByUuidList(String namespace, List<String> uuidList) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        return basicLoanStatusDataMapper.getUserDataListByUuidList(uuidList);
+        return xyqbLoanDataMapper.getUserDataListByUuidList(uuidList);
     }
 
     /**
@@ -71,7 +71,7 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
     @Override
     public List<String> getUnApplyUserUuidList(String namespace, Integer channel) {
         SwitchDataSource.dataSourceSwitch(namespace, "business_flow");
-        return basicLoanStatusDataMapper.getUnApplyLoanUserUuidList(channel);
+        return xyqbLoanDataMapper.getUnApplyLoanUserUuidList(channel);
     }
 
     /**
@@ -82,7 +82,7 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
     @Override
     public boolean queryIfPhoneExist(String namespace, String phone) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        if (basicLoanStatusDataMapper.queryIfPhoneExist(phone) != null) {
+        if (xyqbLoanDataMapper.queryIfPhoneExist(phone) != null) {
             return true;
         }
         return false;
@@ -98,13 +98,13 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
     public List<String> getAuditStatusUserIdList(String namespace, Integer status, Integer channel) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
         if (status == 0) {
-            return basicLoanStatusDataMapper.getAuditStatusUserIdList(0, channel);
+            return xyqbLoanDataMapper.getAuditStatusUserIdList(0, channel);
         }
         if (status == 1) {
-            return basicLoanStatusDataMapper.getAuditStatusUserIdList(1, channel);
+            return xyqbLoanDataMapper.getAuditStatusUserIdList(1, channel);
         }
         if (status == 2) {
-            return basicLoanStatusDataMapper.getAuditStatusUserIdList(2, channel);
+            return xyqbLoanDataMapper.getAuditStatusUserIdList(2, channel);
         }
         return null;
     }
@@ -119,7 +119,7 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
     @Override
     public List<String> queryAuthAndUnWithdraw(String namespace, Integer channel, Integer fundId) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
-        List<String> userIdList = basicLoanStatusDataMapper.queryAuthAndUnWithdraw(channel, fundId);
+        List<String> userIdList = xyqbLoanDataMapper.queryAuthAndUnWithdraw(channel, fundId);
         return userIdList;
     }
 
@@ -130,9 +130,9 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
      * @return
      */
     @Override
-    public List<QueryLoanUser> getUserDataListByUserIdList(String namespace, List<String> userIdList) {
+    public List<XjfqUserEntity> getUserDataListByUserIdList(String namespace, List<String> userIdList) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        List<QueryLoanUser> result = basicLoanStatusDataMapper.getUserDataListByUserIdList(userIdList);
+        List<XjfqUserEntity> result = xyqbLoanDataMapper.getUserDataListByUserIdList(userIdList);
         return result;
     }
 
@@ -146,10 +146,10 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
     public List<String> getLoanStatusUserIdList(String namespace, Integer status, Integer channel, Integer fundId) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
         if (status == 0) {
-            return basicLoanStatusDataMapper.getLoanStatusUserIdList(23, channel, fundId);
+            return xyqbLoanDataMapper.getLoanStatusUserIdList(23, channel, fundId);
         }
         if (status == 1) {
-            return basicLoanStatusDataMapper.getLoanStatusUserIdList(15, channel, fundId);
+            return xyqbLoanDataMapper.getLoanStatusUserIdList(15, channel, fundId);
         }
         return null;
     }
@@ -162,24 +162,24 @@ public class QueryBasicLoanStatusDataServiceImpl implements QueryBasicLoanStatus
     @Override
     public List<String> getMultiOrderUserDataList(String namespace) {
         SwitchDataSource.dataSourceSwitch("fe", "workflow");
-        return basicLoanStatusDataMapper.getMultiOrderuuidList();
+        return xyqbLoanDataMapper.getMultiOrderuuidList();
     }
 
     @Override
     public Integer getAssignFundIdByUserId(String namespace, String userId) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
-        return basicLoanStatusDataMapper.getAssignFundIdByUserId(userId);
+        return xyqbLoanDataMapper.getAssignFundIdByUserId(userId);
     }
 
     @Override
-    public GenLoanUser getUserInfoByPhoneNo(String namespace, String phoneNo) {
+    public XjfqGenProcessVo getUserInfoByPhoneNo(String namespace, String phoneNo) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
-        return basicLoanStatusDataMapper.getUserInfoByPhoneNo(phoneNo);
+        return xyqbLoanDataMapper.getUserInfoByPhoneNo(phoneNo);
     }
 
     @Override
     public Integer getLoanProgressByUserId(String namespace, String userId) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb");
-        return basicLoanStatusDataMapper.getLoanProgressByUserId(userId);
+        return xyqbLoanDataMapper.getLoanProgressByUserId(userId);
     }
 }

src/main/java/cn/qg/qaplatform/zdata/service/impl/QueryLoanUserDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/xyqb/impl/XyqbQueryServiceImpl.java

-package cn.qg.qaplatform.zdata.service.impl;
+package cn.qg.qaplatform.zdata.service.xyqb.impl;
 
-import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
-import cn.qg.qaplatform.zdata.service.QueryLoanUserDataService;
-import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbQueryService;
+import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import cn.qg.qaplatform.utils.page.PageUtil;
 import com.github.pagehelper.PageHelper;
@@ -19,10 +19,10 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
+public class XyqbQueryServiceImpl implements XyqbQueryService {
 
     @Autowired
-    private QueryBasicLoanStatusDataService basicLoanStatusDataService;
+    private XyqbBasicQueryService basicLoanStatusDataService;
 
     /**
      * 筛选某个状态的用户（0-注册未申请，1-授信中，2-审核通过，3-审核拒绝，4-审核通过未提现，5-放款成功，6-放款失败，7-多订单）
@@ -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<QueryLoanUser> result = new ArrayList<>();
+        List<XjfqUserEntity> result = new ArrayList<>();
 
         /**
          * 0-注册未申请
@@ -49,7 +49,7 @@ public class QueryLoanUserDataServiceImpl implements QueryLoanUserDataService {
             }
             PageHelper.startPage(pageNum, pageSize);
             result = basicLoanStatusDataService.getUserDataListByUuidList(namespace, uuidList);
-            PageInfo<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> 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<QueryLoanUser> pageList = new PageInfo<>(result);
+            PageInfo<XjfqUserEntity> pageList = new PageInfo<>(result);
             PageResult pageResult = PageUtil.getPageResult(pageList, pageNum, pageSize);
             return pageResult;
         }

src/main/resources/mapper/zdata/QueryVccDataMapper.xml → src/main/resources/mapper/zdata/VccDataMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.qg.qaplatform.zdata.mapper.QueryVccDataMapper">
+<mapper namespace="cn.qg.qaplatform.zdata.mapper.VccDataMapper">
 
-    <select id="queryVccDataByStatus" resultType="cn.qg.qaplatform.zdata.entity.QueryVccUser">
+    <select id="queryVccDataByStatus" resultType="cn.qg.qaplatform.zdata.entity.VccUserEntity">
         select
         `phone_no` as phoneNo,
         `user_id` as userId,
@@ -18,7 +18,7 @@
          order by id desc
     </select>
 
-    <select id="queryUserVccStatus" resultType="cn.qg.qaplatform.zdata.entity.QueryVccUser">
+    <select id="queryUserVccStatus" resultType="cn.qg.qaplatform.zdata.entity.VccUserEntity">
         select
         `phone_no` as phoneNo,
         `user_id` as userId,

src/main/resources/mapper/zdata/QueryBasicLoanStatusDataMapper.xml → src/main/resources/mapper/zdata/XyqbLoanDataMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.qg.qaplatform.zdata.mapper.QueryBasicLoanStatusDataMapper">
+<mapper namespace="cn.qg.qaplatform.zdata.mapper.XyqbLoanDataMapper">
     <!-- 注册未申请 -->
     <select id="getUnApplyLoanUserUuidList" resultType="java.lang.String">
         SELECT `uuid` FROM `apply_list`
@@ -13,7 +13,7 @@
     </select>
 
     <!-- 根据uuidList获取用户信息列表   -->
-    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.zdata.entity.QueryLoanUser">
+    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.zdata.entity.XjfqUserEntity">
         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.zdata.entity.QueryLoanUser">
+    <select id="getUserDataListByUserIdList" resultType="cn.qg.qaplatform.zdata.entity.XjfqUserEntity">
         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=")">
@@ -94,7 +94,7 @@
     </select>
 
     <!--  根据手机号获取用户信息-->
-    <select id="getUserInfoByPhoneNo" resultType="cn.qg.qaplatform.zdata.entity.GenLoanUser">
+    <select id="getUserInfoByPhoneNo" resultType="cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo">
         SELECT `id` as userId, `phone_no` as phoneNo, `uuid`, `registered_from` as registeredFrom, `created_at` as createdAt  FROM `user`
         WHERE `phone_no` = #{phoneNo}
     </select>