From 09d882262f530ded672f1c01fb65a1fefa00d52d Mon Sep 17 00:00:00 2001
From: ab <myjf007@126.com>
Date: Tue, 05 Nov 2024 09:37:41 +0800
Subject: [PATCH] [fixed]我来贷未推送数据存入到定时器中
---
src/main/java/com/nova/sankuai/service/ICustomerWldPushRecordService.java | 16 ++
src/main/resources/mapper/CustomerWldPushRecordMapper.xml | 5
src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java | 57 +++++++++
src/main/java/com/nova/sankuai/service/impl/CustomerWldPushRecordServiceImpl.java | 20 +++
src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java | 191 +++++++++++++++++++++++++++++++
src/main/java/com/nova/sankuai/DefaultScheduleTask.java | 26 +++
src/main/java/com/nova/sankuai/infra/mapper/CustomerWldPushRecordMapper.java | 16 ++
7 files changed, 327 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nova/sankuai/DefaultScheduleTask.java b/src/main/java/com/nova/sankuai/DefaultScheduleTask.java
index 952ece4..5a32d78 100644
--- a/src/main/java/com/nova/sankuai/DefaultScheduleTask.java
+++ b/src/main/java/com/nova/sankuai/DefaultScheduleTask.java
@@ -1,12 +1,12 @@
package com.nova.sankuai;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.nova.sankuai.domain.entity.CustomerWldPushRecord;
import com.nova.sankuai.domain.entity.PayRecord;
import com.nova.sankuai.infra.utils.MessageCodeUtil;
-import com.nova.sankuai.service.ICapitalInfoService;
-import com.nova.sankuai.service.ICustomerCapitalResultService;
-import com.nova.sankuai.service.IPayRecordService;
-import com.nova.sankuai.service.IYqgRepayOrderService;
+import com.nova.sankuai.infra.utils.wolaidai.WolaidaiUtil;
+import com.nova.sankuai.infra.utils.zcy.ZcyUtil;
+import com.nova.sankuai.service.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.List;
@Configuration
@EnableScheduling
@@ -36,6 +37,9 @@
@Resource
private ICustomerCapitalResultService customerCapitalResultService;
+
+ @Resource
+ private ICustomerWldPushRecordService customerWldPushRecordService;
@Resource
private ICapitalInfoService capitalInfoService;
@@ -98,6 +102,20 @@
payRecordService.remove(wrapper);
}
+ @Resource
+ private WolaidaiUtil wolaidaiUtil;
+ /**
+ * ab于2024-11-04日新增：每隔5分钟执行一次任务，推送我来贷未推送过的数据
+ */
+ @Scheduled(fixedRate = 300000) //每隔5分钟执行一次任务, 单位为毫秒
+ private void wldPush() {
+
+ List<CustomerWldPushRecord> lst = customerWldPushRecordService.list();
+ for (CustomerWldPushRecord customerWldPushRecord : lst) {
+ wolaidaiUtil.wldCronPush(customerWldPushRecord);
+ }
+ }
+
/*@ApiOperation(value = "定时每天9点半开启慧借")
@Scheduled(cron = "0 30 9 * * ?")
private void startHj() {
diff --git a/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java b/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java
new file mode 100644
index 0000000..f51c438
--- /dev/null
+++ b/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java
@@ -0,0 +1,57 @@
+package com.nova.sankuai.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 我来贷进件推送记录表
+ * </p>
+ *
+ * @author ab
+ * @since 2024-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("customer_wld_push_record")
+@ApiModel(value="CustomerWldPushRecord对象", description="我来贷进件推送记录表")
+public class CustomerWldPushRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "自动增量")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "产品方分配的唯一标识")
+ private String partnerId;
+
+ @ApiModelProperty(value = "AES加密后的字符串")
+ private String bizData;
+
+ @ApiModelProperty(value = "时间戳")
+ private Integer timestamp;
+
+ @ApiModelProperty(value = "签名")
+ private String sign;
+
+ @ApiModelProperty(value = "资方id")
+ private Long capitalId;
+
+ @ApiModelProperty(value = "推送状态 0未执行 1进件成功 2进件失败")
+ private Boolean status;
+
+ @ApiModelProperty(value = "推送时间")
+ private LocalDateTime createTime;
+
+
+}
diff --git a/src/main/java/com/nova/sankuai/infra/mapper/CustomerWldPushRecordMapper.java b/src/main/java/com/nova/sankuai/infra/mapper/CustomerWldPushRecordMapper.java
new file mode 100644
index 0000000..561b531
--- /dev/null
+++ b/src/main/java/com/nova/sankuai/infra/mapper/CustomerWldPushRecordMapper.java
@@ -0,0 +1,16 @@
+package com.nova.sankuai.infra.mapper;
+
+import com.nova.sankuai.domain.entity.CustomerWldPushRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 我来贷进件推送记录表 Mapper 接口
+ * </p>
+ *
+ * @author ab
+ * @since 2024-11-04
+ */
+public interface CustomerWldPushRecordMapper extends BaseMapper<CustomerWldPushRecord> {
+
+}
diff --git a/src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java b/src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java
index 42e8aa6..b0e5c6a 100644
--- a/src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java
+++ b/src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java
@@ -181,6 +181,7 @@
private final ICustomerCheckRecordService customerCheckRecordService; // 用户准入务
private final ICustomerH5ClickService customerH5ClickService; // H5用户点击埋点服务
private final ICapitalInfoService capitalInfoService; // 资金信息服务
+ private final ICustomerWldPushRecordService customerWldPushRecordService; // 我来贷推送记录服务
private final EsdUtil esdUtil;
private final HjqbUtil hjqbUtil;
private final SyhUtil syhUtil;
@@ -702,6 +703,10 @@
log.error("日志编号：{},【我来贷】{}参数验签失败，jsonData：{} ex：{}", logNumber, basicInfo.get("targetName"), body, "验签失败");
}
} catch (Exception e) {
+ // 失败，未执行的数据，则保存到记录表，后面再用定时器执行
+ CustomerWldPushRecord customerWldPushRecord = new CustomerWldPushRecord();
+ BeanUtils.copyProperties(customerWldPushRecord, body);
+ savePushData(customerWldPushRecord);
resp.setMsg(e.getMessage());
log.error("日志编号：{}，【我来贷】{}，请求失败：{} 错误原因：{}", logNumber, basicInfo.get("targetName"), body, e.getMessage());
}
@@ -740,6 +745,184 @@
return resp;
}
+ public void wldCronPush(CustomerWldPushRecord customerWldPushRecord) {
+ String logNumber = IdUtil.randomUUID(); // 生成日志编号
+ log.info("日志编号：{} , 定时器自动进件， 要推送的数据:{}", logNumber, customerWldPushRecord);
+ JSONObject getFullData = new JSONObject(); // 创建JSON对象存储数据
+ getFullData.putOpt("partner_id", customerWldPushRecord.getPartnerId()); // 存储合作伙伴ID
+ getFullData.putOpt("timestamp", customerWldPushRecord.getTimestamp()); // 存储时间戳
+ getFullData.putOpt("biz_data", customerWldPushRecord.getBizData()); // 存储业务数据
+ Map<String, String> basicInfo = getBasicInfoByAction("apply");
+ String chnOrderId = "";
+ // 解密+验签
+ String decryptStr = decrypt(getFullData, customerWldPushRecord.getSign(), wldPublicKey);// 解密
+ if (StringUtils.isNotEmpty(decryptStr)) {
+ Customer customer = new Customer();
+ // 修改借款额度，采用随机生成
+ Random random = new Random();
+ int lowerBound = 5000; // 最小值
+ int upperBound = 50000; // 最大值
+
+ // 生成随机的100倍数
+ int randomValue = lowerBound + (random.nextInt((upperBound - lowerBound) / 100 + 1) * 100);
+ // 数据保存到数据库中
+ ApplyDto applyDto = JSON.parseObject(decryptStr, ApplyDto.class);
+ ProfileDictDto profileDictDto = applyDto.getProfile_dict();
+ profileDictDto.setRequest_amount(String.valueOf(randomValue));
+ applyDto.setProfile_dict(profileDictDto);
+ //取出订单编号
+ chnOrderId = applyDto.getChn_order_id();
+ log.info("日志编号：{}，定时器自动进件， 保存进件数据：{}", logNumber, applyDto);
+ customer = saveData(applyDto);
+ JSON.toJSONString(applyDto);
+ decryptStr = JSON.toJSONString(applyDto);
+
+ // 遍历半流程资金信息列表
+ List<CapitalInfo> capitalInfoList = getCapitalInfoList();
+ log.info("日志编号：{}，定时器自动进件， 半半流程的资方列表：【{}】", logNumber, capitalInfoList); // 半流程的资方列表
+ CustomerApplyOrder customerApplyOrder;
+ LambdaQueryWrapper<CustomerApplyOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(CustomerApplyOrder::getChnOrderId, chnOrderId);
+ wrapper.last("limit 1");
+ for (CapitalInfo capitalInfo : capitalInfoList) {
+ // 先判断有没有推过，如果有则不再推送
+ wrapper.eq(CustomerApplyOrder::getCapitalId, capitalInfo.getId());
+ customerApplyOrder = customerApplyOrderService.getOne(wrapper);
+ if (Objects.isNull(customerApplyOrder)) {
+ Map<String, String> config = getConfigByCapitalName(capitalInfo.getName());// 获取对应的配置
+ log.info("日志编号：{}，定时器自动进件， 资方名：【{}】，config配置信息: {}", logNumber,capitalInfo.getName(), config); // 记录资金信息
+ JSONObject fullData = new JSONObject();// 创建完整数据的JSON对象
+ fullData.putOpt("partner_id", config.get("partnerId")); // 设置合作伙伴ID
+ fullData.putOpt("timestamp", System.currentTimeMillis());// 设置当前时间戳
+ fullData.putOpt("biz_data", encrypt(decryptStr)); // 设置业务数据
+ //生成新的签名
+ fullData.putOpt("sign", getSign(fullData, config.get("publicKey")));// 计算签名
+ String result = null;// 初始化结果
+ if (StringUtils.isNotEmpty(config.get("basicUrl"))) {// 如果基础URL有效
+ try {
+ result = HttpClientUtil.getInstance().postJsonData(config.get("basicUrl") + basicInfo.get("url"), String.valueOf(fullData)); // 调用接口
+ log.info("日志编号：{}，定时器自动进件，资方名：【{}】，参数：{}，result: {}", logNumber, capitalInfo.getName(), fullData, result);// 记录接口结果
+ if (result != null) { // 确保result不为空
+ RbResponse resp = JSON.parseObject(result, RbResponse.class);// 解析响应
+ String data = resp.getData();// 获取数据部分
+ JSONObject hjData = new JSONObject();
+ RongBeBasicDto rb = JSON.parseObject(data, RongBeBasicDto.class); // 解析业务DTO
+ hjData.putOpt("biz_data", rb.getBiz_data());// 获取业务数据
+ if (Objects.equals(resp.getCode(), SUCCESS_CODE)) { // // 判断是否成功
+ // 解密biz_data
+ hjData.putOpt("partner_id", rb.getPartner_id()); // 设置合作伙伴ID为融呗，我来贷只认融呗的信息
+ hjData.putOpt("timestamp", rb.getTimestamp()); // 设置时间戳
+ String decryptHjStr = decrypt(hjData, rb.getSign(), config.get("publicKey"));// 解密hjData
+ if (StringUtils.isNotEmpty(decryptHjStr)) {// 判断解密结果
+ ApplyData applyData = JSON.parseObject(decryptHjStr, ApplyData.class);
+ if (applyData.getStatus() == 0) { // 进件成功后才保存
+ // 进件成功后，调用接受订单状态接口推送数据给我来贷
+ OrderStatusByWld(chnOrderId, applyData.getPartner_flow_id());
+
+ // 调用接受授信结果接口推送授信结果给我来贷
+ autoPushCreditResult(chnOrderId, applyData.getPartner_flow_id());
+ }
+ // 保存进件记录
+ customerApplyOrder = getCustomerApplyOrder(chnOrderId, applyData, capitalInfo, config.get("partnerId"), decryptStr);
+ customerApplyOrderService.save(customerApplyOrder);
+ log.info("日志编号：{}，【{}】，定时器自动进件解密结果：{}", logNumber, capitalInfo.getName(), decryptHjStr);
+ } else {
+ log.error("日志编号：{}, 【{}】，定时器自动进件解密结果失败：{}", logNumber, capitalInfo.getName(), decryptHjStr);
+ }
+ } else {
+ log.error("日志编号：{}, 资方：【{}】定时器自动进件失败：{}", logNumber, capitalInfo.getName(), result);
+ }
+ }
+ } catch (Exception ex) {
+ // 处理请求异常
+ log.error("日志编号：{}，定时器自动进件， 资方名：【{}】，传参：{} ex：{}", logNumber, capitalInfo.getName(), fullData, ex.getMessage());//记录异常堆栈
+ }
+ }
+ }
+
+ }
+ // 遍历非半流程资金信息列表
+ List<CapitalInfo> lst = getNotHalfCapitalInfoList();
+ log.info("日志编号：{}，定时器自动进件， 非半流程的资方列表：【{}】", logNumber, lst); // 非半流程的资方列表
+ for (CapitalInfo capitalInfo : lst) {
+ // 先判断有没有推过，如果有则不再推送
+ wrapper.eq(CustomerApplyOrder::getCapitalId, capitalInfo.getId());
+ customerApplyOrder = customerApplyOrderService.getOne(wrapper);
+ if (Objects.isNull(customerApplyOrder)) {
+ wrapper.eq(CustomerApplyOrder::getCapitalId, capitalInfo.getId());
+ customerApplyOrder = customerApplyOrderService.getOne(wrapper);
+ if (Objects.isNull(customerApplyOrder)) {
+ boolean halfFlag = false;
+ //调用对应资方的推送机制
+ if (capitalInfo.getId() == 25L) { //e时贷
+ halfFlag = esdUtil.wldPushToEsd(customer, logNumber);
+
+ } else if (capitalInfo.getId() == 12L) { //慧借钱包
+ halfFlag = hjqbUtil.wldPushToHjqb(customer, logNumber);
+
+ } else if (capitalInfo.getId() == 41L) { //好汇推
+ halfFlag = hhtUtil.wldPushToHht(customer, logNumber);
+
+ } else if (capitalInfo.getId() == 36L) { //随易花
+ halfFlag = syhUtil.wldPushToSyh(customer, logNumber);
+ }
+
+ if (halfFlag) {
+
+ // 进件成功后，调用接受订单状态接口推送数据给我来贷
+ OrderStatusByWld(chnOrderId, applyData.getPartner_flow_id());
+
+ // 调用接受授信结果接口推送授信结果给我来贷
+ autoPushCreditResult(chnOrderId, applyData.getPartner_flow_id());
+ }
+
+ // 保存进件记录
+ customerApplyOrder = getCustomerApplyOrder(chnOrderId, applyData, capitalInfo, "28", decryptStr);
+ customerApplyOrderService.save(customerApplyOrder);
+ }
+ }
+ }
+ // 遍历非半流程资金方式线上贷款信息列表
+ List<CapitalInfo> notHalfFundTypeCapitalInfoList = getNotHalfFundTypeCapitalInfoList();
+ log.info("日志编号：{}，定时器自动进件， 非半流程资金方式线上贷款信息列表：【{}】", logNumber, lst); // 非半流程资金方式线上贷款信息列表
+ Customer customer = new Customer();
+ for (CapitalInfo capitalInfo : notHalfFundTypeCapitalInfoList) {
+ // 先判断有没有推过，如果有则不再推送
+ wrapper.eq(CustomerApplyOrder::getCapitalId, capitalInfo.getId());
+ customerApplyOrder = customerApplyOrderService.getOne(wrapper);
+ if (Objects.isNull(customerApplyOrder)) {
+ boolean halfFlag = false;
+ //调用对应资方的推送机制
+ if (capitalInfo.getId() == 25L) { //e时贷
+ halfFlag = esdUtil.wldPushToEsd(customer, logNumber);
+
+ } else if (capitalInfo.getId() == 12L) { //慧借钱包
+ halfFlag = hjqbUtil.wldPushToHjqb(customer, logNumber);
+
+ } else if (capitalInfo.getId() == 41L) { //好汇推
+ halfFlag = hhtUtil.wldPushToHht(customer, logNumber);
+
+ } else if (capitalInfo.getId() == 36L) { //随易花
+ halfFlag = syhUtil.wldPushToSyh(customer, logNumber);
+ }
+
+ if (halfFlag) {
+
+ // 进件成功后，调用接受订单状态接口推送数据给我来贷
+ OrderStatusByWld(chnOrderId, applyData.getPartner_flow_id());
+
+ // 调用接受授信结果接口推送授信结果给我来贷
+ autoPushCreditResult(chnOrderId, applyData.getPartner_flow_id());
+ }
+
+ // 保存进件记录
+ customerApplyOrder = getCustomerApplyOrder(chnOrderId, applyData, capitalInfo, "28", decryptStr);
+ customerApplyOrderService.save(customerApplyOrder);
+ }
+ }
+ }
+ }
+
private static @NotNull CustomerApplyOrder getCustomerApplyOrder(String chnOrderId, ApplyData applyData, CapitalInfo capitalInfo, String partnerId, String decryptStr) {
CustomerApplyOrder customerApplyOrder = new CustomerApplyOrder();
customerApplyOrder.setCapitalId(capitalInfo.getId());
@@ -774,6 +957,14 @@
}
/**
+ * 保存我来贷推送的数据记录
+ * @param customerWldPushRecord 要保存的数据
+ */
+ private void savePushData(CustomerWldPushRecord customerWldPushRecord) {
+ customerWldPushRecordService.save(customerWldPushRecord);
+ }
+
+ /**
* 保存数据
* @param applyDto 数据对象
*/
diff --git a/src/main/java/com/nova/sankuai/service/ICustomerWldPushRecordService.java b/src/main/java/com/nova/sankuai/service/ICustomerWldPushRecordService.java
new file mode 100644
index 0000000..efe059d
--- /dev/null
+++ b/src/main/java/com/nova/sankuai/service/ICustomerWldPushRecordService.java
@@ -0,0 +1,16 @@
+package com.nova.sankuai.service;
+
+import com.nova.sankuai.domain.entity.CustomerWldPushRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 我来贷进件推送记录表 服务类
+ * </p>
+ *
+ * @author ab
+ * @since 2024-11-04
+ */
+public interface ICustomerWldPushRecordService extends IService<CustomerWldPushRecord> {
+
+}
diff --git a/src/main/java/com/nova/sankuai/service/impl/CustomerWldPushRecordServiceImpl.java b/src/main/java/com/nova/sankuai/service/impl/CustomerWldPushRecordServiceImpl.java
new file mode 100644
index 0000000..9e0fb7f
--- /dev/null
+++ b/src/main/java/com/nova/sankuai/service/impl/CustomerWldPushRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.nova.sankuai.service.impl;
+
+import com.nova.sankuai.domain.entity.CustomerWldPushRecord;
+import com.nova.sankuai.infra.mapper.CustomerWldPushRecordMapper;
+import com.nova.sankuai.service.ICustomerWldPushRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 我来贷进件推送记录表 服务实现类
+ * </p>
+ *
+ * @author ab
+ * @since 2024-11-04
+ */
+@Service
+public class CustomerWldPushRecordServiceImpl extends ServiceImpl<CustomerWldPushRecordMapper, CustomerWldPushRecord> implements ICustomerWldPushRecordService {
+
+}
diff --git a/src/main/resources/mapper/CustomerWldPushRecordMapper.xml b/src/main/resources/mapper/CustomerWldPushRecordMapper.xml
new file mode 100644
index 0000000..d093c1a
--- /dev/null
+++ b/src/main/resources/mapper/CustomerWldPushRecordMapper.xml
@@ -0,0 +1,5 @@
+<?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="com.nova.sankuai.infra.mapper.CustomerWldPushRecordMapper">
+
+</mapper>
--
Gitblit v1.9.3