Commit 715dfe0b authored by 黎博's avatar 黎博

修改项目结构

parent 94a7b778
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);
}
/**
......
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;
......
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;
......
package cn.qg.qaplatform.zdata.utils;
package cn.qg.qaplatform.stools.utils.kdsp;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
......
package cn.qg.qaplatform.zdata.utils;
package cn.qg.qaplatform.stools.utils.kdsp;
public class ConfigureEncryptAndDecrypt {
public static final String CHAR_ENCODING = "UTF-8";
......
package cn.qg.qaplatform.zdata.utils;
package cn.qg.qaplatform.stools.utils.kdsp;
import java.security.Key;
import java.security.KeyFactory;
......
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;
}
......@@ -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;
......
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();
}
......
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);
}
}
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")
......
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 获取所有借款用户状态
......
......@@ -2,8 +2,11 @@ package cn.qg.qaplatform.zdata.entity;
import lombok.Data;
/**
* vcc造数据结果页信息
*/
@Data
public class GenVccUser {
public class VccOpenResultVo {
/**
* 手机号
*/
......
......@@ -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;
}
......@@ -4,8 +4,11 @@ import lombok.Data;
import java.util.Date;
/**
* 现金分期造数据过程中
*/
@Data
public class GenLoanUser {
public class XjfqGenProcessVo {
/**
* 手机号
*/
......
......@@ -7,7 +7,7 @@ import java.util.Date;
* 捞数据返回的用户实体类
*/
@Data
public class QueryLoanUser {
public class XjfqUserEntity {
/**
* 手机号
*/
......
......@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
* 造数据传递的参数实体类
*/
@Data
public class ApplyDataVo {
public class XyqbApplyDataVo {
@NotNull(message = "借款状态不能为空!")
private Integer status;
......
......@@ -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;
......
......@@ -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;
......
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);
}
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);
}
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";
......
package cn.qg.qaplatform.zdata.service;
package cn.qg.qaplatform.zdata.service.risk;
/**
* 风控相关接口
* 风控相关服务
*/
public interface RuleEngineService {
/**
......
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");
......
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);
}
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);
}
}
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;
}
package cn.qg.qaplatform.zdata.service;
package cn.qg.qaplatform.zdata.service.xyqb;
/**
* 查询造数据流程中的状态
......
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获取用户放款状态
......
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);
}
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 用户状态
......
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);
......
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)) {
......
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);
}
}
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.entity.ApplyDataVo;
import cn.qg.qaplatform.zdata.entity.GenLoanUser;
import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
import cn.qg.qaplatform.zdata.process.Xyqb;
import cn.qg.qaplatform.zdata.service.QueryInProcessStatusService;
import cn.qg.qaplatform.zdata.service.XyqbDataService;
import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
import cn.qg.qaplatform.zdata.service.xyqb.QueryInProcessStatusService;
import cn.qg.qaplatform.zdata.service.xyqb.XyqbGenDataService;
import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
import com.alibaba.fastjson.JSONException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -20,13 +20,13 @@ import java.util.Map;
@Service
@Slf4j
public class XyqbDataServiceImpl implements XyqbDataService {
public class XyqbGenDataServiceImpl implements XyqbGenDataService {
@Resource
RedisTemplate redisTemplate;
@Autowired
QueryBasicLoanStatusDataService queryBasicLoanStatusDataService;
XyqbBasicQueryService xyqbBasicQueryService;
@Autowired
QueryInProcessStatusService queryInProcessStatusService;
......@@ -71,21 +71,21 @@ public class XyqbDataServiceImpl implements XyqbDataService {
/**
* 授信
* @param applyDataVo 造数据的相关信息
* @param xyqbApplyDataVo 造数据的相关信息
* @return
* @throws Exception
*/
@Override
public boolean quotaAuth(ApplyDataVo applyDataVo, boolean auditResult) throws Exception {
String namespace = applyDataVo.getNamespace();
String phoneNo = applyDataVo.getPhoneNo();
Integer channelId = applyDataVo.getChannel();
Integer fundId = applyDataVo.getFundId();
Integer amount = applyDataVo.getAmount();
Integer term = applyDataVo.getTerm();
String symbol = applyDataVo.getSymbol();
String name = applyDataVo.getName();
String idCardNo = applyDataVo.getIdCardNo();
public boolean quotaAuth(XyqbApplyDataVo xyqbApplyDataVo, boolean auditResult) throws Exception {
String namespace = xyqbApplyDataVo.getNamespace();
String phoneNo = xyqbApplyDataVo.getPhoneNo();
Integer channelId = xyqbApplyDataVo.getChannel();
Integer fundId = xyqbApplyDataVo.getFundId();
Integer amount = xyqbApplyDataVo.getAmount();
Integer term = xyqbApplyDataVo.getTerm();
String symbol = xyqbApplyDataVo.getSymbol();
String name = xyqbApplyDataVo.getName();
String idCardNo = xyqbApplyDataVo.getIdCardNo();
// 登录
String token = Xyqb.login(namespace, channelId, phoneNo);
......@@ -130,21 +130,21 @@ public class XyqbDataServiceImpl implements XyqbDataService {
/**
* 提现
* @param applyDataVo 造数据相关信息
* @param xyqbApplyDataVo 造数据相关信息
* @param auditResult 二次风控成功or失败
* @return
* @throws Exception
*/
@Override
public boolean withDraw(ApplyDataVo applyDataVo, boolean auditResult) throws Exception {
String namespace = applyDataVo.getNamespace();
String phoneNo = applyDataVo.getPhoneNo();
Integer channelId = applyDataVo.getChannel();
Integer fundId = applyDataVo.getFundId();
Integer amount = applyDataVo.getAmount();
Integer term = applyDataVo.getTerm();
String bankCardNo = applyDataVo.getBankCardNo();
String bankCode = applyDataVo.getBankCode();
public boolean withDraw(XyqbApplyDataVo xyqbApplyDataVo, boolean auditResult) throws Exception {
String namespace = xyqbApplyDataVo.getNamespace();
String phoneNo = xyqbApplyDataVo.getPhoneNo();
Integer channelId = xyqbApplyDataVo.getChannel();
Integer fundId = xyqbApplyDataVo.getFundId();
Integer amount = xyqbApplyDataVo.getAmount();
Integer term = xyqbApplyDataVo.getTerm();
String bankCardNo = xyqbApplyDataVo.getBankCardNo();
String bankCode = xyqbApplyDataVo.getBankCode();
// 登录
String token = Xyqb.login(namespace, channelId, phoneNo);
......@@ -191,17 +191,17 @@ public class XyqbDataServiceImpl implements XyqbDataService {
/**
* 放款
* @param applyDataVo
* @param xyqbApplyDataVo
* @return
*/
@Override
public boolean makeLoan(ApplyDataVo applyDataVo, boolean payStatus) throws Exception {
String namespace = applyDataVo.getNamespace();
String phoneNo = applyDataVo.getPhoneNo();
Integer channelId = applyDataVo.getChannel();
Integer fundId = applyDataVo.getFundId();
Integer amount = applyDataVo.getAmount();
Integer term = applyDataVo.getTerm();
public boolean makeLoan(XyqbApplyDataVo xyqbApplyDataVo, boolean payStatus) throws Exception {
String namespace = xyqbApplyDataVo.getNamespace();
String phoneNo = xyqbApplyDataVo.getPhoneNo();
Integer channelId = xyqbApplyDataVo.getChannel();
Integer fundId = xyqbApplyDataVo.getFundId();
Integer amount = xyqbApplyDataVo.getAmount();
Integer term = xyqbApplyDataVo.getTerm();
// 登录
String token = Xyqb.login(namespace, channelId, phoneNo);
......@@ -246,15 +246,15 @@ public class XyqbDataServiceImpl implements XyqbDataService {
@Override
public boolean genLoanUser(ApplyDataVo applyDataVo) throws Exception {
Integer status = applyDataVo.getStatus();
String namespace = applyDataVo.getNamespace();
Integer fundId = applyDataVo.getFundId();
String symbol = applyDataVo.getSymbol();
String phoneNo = applyDataVo.getPhoneNo();
public boolean genLoanUser(XyqbApplyDataVo xyqbApplyDataVo) throws Exception {
Integer status = xyqbApplyDataVo.getStatus();
String namespace = xyqbApplyDataVo.getNamespace();
Integer fundId = xyqbApplyDataVo.getFundId();
String symbol = xyqbApplyDataVo.getSymbol();
String phoneNo = xyqbApplyDataVo.getPhoneNo();
WebSocketServer.sendInfo("本次请求的参数为:" + applyDataVo.toString(), symbol);
log.info("本次请求的参数为:" + applyDataVo.toString());
WebSocketServer.sendInfo("本次请求的参数为:" + xyqbApplyDataVo.toString(), symbol);
log.info("本次请求的参数为:" + xyqbApplyDataVo.toString());
boolean assignFundResult = assignFundCorp(namespace, fundId, symbol);
log.info("分配资金方的结果为:" + assignFundResult);
......@@ -267,40 +267,40 @@ public class XyqbDataServiceImpl implements XyqbDataService {
* 0 - 审核通过
*/
if (status == 0) {
return quotaAuth(applyDataVo, true);
return quotaAuth(xyqbApplyDataVo, true);
}
/**
* 1 - 审核拒绝
*/
if (status == 1) {
return quotaAuth(applyDataVo, false);
return quotaAuth(xyqbApplyDataVo, false);
}
/**
* 2 - 放款中
*/
if (status == 2) {
boolean result = quotaAuth(applyDataVo, true);
boolean result = quotaAuth(xyqbApplyDataVo, true);
if (!result) {
return false;
}
// 查询资方审核进度,如未分配成功,则阻塞下一步
queryInProcessStatusService.queryFundingAssignProgress(namespace, phoneNo, fundId, symbol);
return withDraw(applyDataVo, true);
return withDraw(xyqbApplyDataVo, true);
}
/**
* 3 - 放款成功
*/
if (status == 3) {
boolean quotaAuthResult = quotaAuth(applyDataVo, true);
boolean quotaAuthResult = quotaAuth(xyqbApplyDataVo, true);
if (!quotaAuthResult) {
return false;
}
// 查询资方审核进度,如未分配成功,则阻塞下一步
queryInProcessStatusService.queryFundingAssignProgress(namespace, phoneNo, fundId, symbol);
boolean withDrawResult = withDraw(applyDataVo, true);
boolean withDrawResult = withDraw(xyqbApplyDataVo, true);
if (!withDrawResult) {
WebSocketServer.sendInfo("提现失败!", symbol);
return false;
......@@ -321,7 +321,7 @@ public class XyqbDataServiceImpl implements XyqbDataService {
WebSocketServer.sendInfo("提现成功,10秒后放款!", symbol);
Thread.sleep(10000);
// 广达小贷-手动放款
boolean makeLoanResult = makeLoan(applyDataVo, true);
boolean makeLoanResult = makeLoan(xyqbApplyDataVo, true);
if (makeLoanResult) {
WebSocketServer.sendInfo("放款成功!", symbol);
} else {
......@@ -334,7 +334,7 @@ public class XyqbDataServiceImpl implements XyqbDataService {
* 4 - 放款失败
*/
if (status == 4) {
boolean quotaAuthResult = quotaAuth(applyDataVo, true);
boolean quotaAuthResult = quotaAuth(xyqbApplyDataVo, true);
if (!quotaAuthResult) {
return false;
}
......@@ -342,19 +342,19 @@ public class XyqbDataServiceImpl implements XyqbDataService {
queryInProcessStatusService.queryFundingAssignProgress(namespace, phoneNo, fundId, symbol);
// 云南信托:二次风控失败,即代表放款失败
if (fundId == 1040 || fundId == 1030) {
withDraw(applyDataVo, false);
withDraw(xyqbApplyDataVo, false);
WebSocketServer.sendInfo("放款失败!", symbol);
setUserStatusRedisValue(namespace, phoneNo, 4);
return true;
}
boolean withDrawResult = withDraw(applyDataVo, true);
boolean withDrawResult = withDraw(xyqbApplyDataVo, true);
if (!withDrawResult) {
WebSocketServer.sendInfo("提现失败!", symbol);
return false;
}
WebSocketServer.sendInfo("提现成功,10秒后放款!", symbol);
Thread.sleep(10000);
boolean makeLoanResult = makeLoan(applyDataVo, false);
boolean makeLoanResult = makeLoan(xyqbApplyDataVo, false);
if (makeLoanResult) {
WebSocketServer.sendInfo("放款失败!", symbol);
}
......@@ -365,44 +365,44 @@ public class XyqbDataServiceImpl implements XyqbDataService {
}
@Override
public GenLoanUser queryUserStatus(String namespace, String phoneNo) {
public XjfqGenProcessVo queryUserStatus(String namespace, String phoneNo) {
String redisResult = redisTemplate.opsForValue().get(namespace + "_" + phoneNo).toString();
log.info("获取redis key结果为:" + redisResult);
GenLoanUser genLoanUser = new GenLoanUser();
genLoanUser = queryBasicLoanStatusDataService.getUserInfoByPhoneNo(namespace, phoneNo);
genLoanUser.setFundId(queryBasicLoanStatusDataService.getAssignFundIdByUserId(namespace, genLoanUser.getUserId()));
XjfqGenProcessVo xjfqGenProcessVo = new XjfqGenProcessVo();
xjfqGenProcessVo = xyqbBasicQueryService.getUserInfoByPhoneNo(namespace, phoneNo);
xjfqGenProcessVo.setFundId(xyqbBasicQueryService.getAssignFundIdByUserId(namespace, xjfqGenProcessVo.getUserId()));
// 授信审核中
if (redisResult.equals("0")) {
genLoanUser.setStatus(0);
genLoanUser.setDesc("授信审核中");
xjfqGenProcessVo.setStatus(0);
xjfqGenProcessVo.setDesc("授信审核中");
}
// 授信审核失败
if (redisResult.equals("1")) {
genLoanUser.setStatus(1);
genLoanUser.setDesc("授信审核失败");
xjfqGenProcessVo.setStatus(1);
xjfqGenProcessVo.setDesc("授信审核失败");
}
// 提现成功
if (redisResult.equals("2")) {
// 设置资方id
genLoanUser.setStatus(2);
genLoanUser.setDesc("提现成功");
xjfqGenProcessVo.setStatus(2);
xjfqGenProcessVo.setDesc("提现成功");
}
// 提现失败
if (redisResult.equals("10")) {
genLoanUser.equals("10");
genLoanUser.setDesc("资方分配失败");
xjfqGenProcessVo.equals("10");
xjfqGenProcessVo.setDesc("资方分配失败");
}
// 放款成功
if (redisResult.equals("3")) {
genLoanUser.setStatus(3);
genLoanUser.setDesc("放款成功");
xjfqGenProcessVo.setStatus(3);
xjfqGenProcessVo.setDesc("放款成功");
}
// 放款失败
if (redisResult.equals("4")) {
genLoanUser.setStatus(4);
genLoanUser.setDesc("放款失败");
xjfqGenProcessVo.setStatus(4);
xjfqGenProcessVo.setDesc("放款失败");
}
return genLoanUser;
return xjfqGenProcessVo;
}
......
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;
}
......
<?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,
......
<?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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment