From bead00668eebce8d39d027515d564376de2f5978 Mon Sep 17 00:00:00 2001
From: ab <myjf007@126.com>
Date: Tue, 05 Nov 2024 09:39:39 +0800
Subject: [PATCH] [fixed]我来贷未推送数据存入到定时器中
---
src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java | 2 +-
src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java | 46 ++++------------------------------------------
src/main/java/com/nova/sankuai/DefaultScheduleTask.java | 2 +-
3 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/nova/sankuai/DefaultScheduleTask.java b/src/main/java/com/nova/sankuai/DefaultScheduleTask.java
index 5a32d78..cc3c30e 100644
--- a/src/main/java/com/nova/sankuai/DefaultScheduleTask.java
+++ b/src/main/java/com/nova/sankuai/DefaultScheduleTask.java
@@ -107,7 +107,7 @@
/**
* ab于2024-11-04日新增：每隔5分钟执行一次任务，推送我来贷未推送过的数据
*/
- @Scheduled(fixedRate = 300000) //每隔5分钟执行一次任务, 单位为毫秒
+ @Scheduled(fixedRate = 300000) //每隔5分钟(300000)执行一次任务, 单位为毫秒
private void wldPush() {
List<CustomerWldPushRecord> lst = customerWldPushRecordService.list();
diff --git a/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java b/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java
index f51c438..51df1f6 100644
--- a/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java
+++ b/src/main/java/com/nova/sankuai/domain/entity/CustomerWldPushRecord.java
@@ -39,7 +39,7 @@
private String bizData;
@ApiModelProperty(value = "时间戳")
- private Integer timestamp;
+ private Long timestamp;
@ApiModelProperty(value = "签名")
private String sign;
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 b0e5c6a..b70826f 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
@@ -17,7 +17,6 @@
import com.nova.sankuai.domain.dto.rongbei.ProfileDictDto;
import com.nova.sankuai.domain.dto.rongbei.RongBeBasicDto; // 融贝基础DTO
import com.nova.sankuai.domain.entity.*;
-import com.nova.sankuai.infra.config.CommonException;
import com.nova.sankuai.infra.utils.ConstantsUtil;
import com.nova.sankuai.infra.utils.eshidai.EsdUtil;
import com.nova.sankuai.infra.utils.hht.HhtUtil;
@@ -81,9 +80,6 @@
@Value("${rongbei.h5HalfUrl}")
private String h5HalfUrl; // 融呗非半流程h5Url
-
- @Value("${front.refreshToUrl}")
- private String refreshToUrl; // 前端跳转地址
@Value("${rongbei.wolaidai.url}")
private String wldUrl; // 我来贷URL
@@ -399,7 +395,7 @@
JSON.toJSONString(applyDto);
decryptStr = JSON.toJSONString(applyDto);
//发送短信通知（等待供应商审批短信模板 申请完后在恢复注释）
- smsNotify(profileDictDto.getPhone());
+ //smsNotify(profileDictDto.getPhone());
}
String bizDataStr = "";
String fBizDataStr = "";
@@ -417,22 +413,9 @@
Long capitalId = customerApplyOrder.getCapitalId();
String h5Url = "";
// 如果是慧钱，随易花，e时贷，好汇推，则转为乐享融的指定id：28
- if (capitalId == 12L || capitalId == 41L || capitalId == 36L || capitalId == 25L) {
+ if (capitalId == 12L || capitalId == 41L || capitalId == 36L || capitalId == 25L || capitalId == 4L) {
h5Url = h5HalfUrl + "&capitalId="+ capitalId + "&mobile=" + customerApplyOrder.getPhone();
//h5Url = rbH5Url + "&capitalId=28";
- }else if(capitalId == 4L){
-// com.nova.sankuai.domain.api.zhongzan.RbResponse rbResponse = qingHuaYouPinUtil.queryApprovalToWolaidai(customerApplyOrder.getChnOrderId());
-// if (rbResponse != null) {
-// if (Objects.equals("200",resp.getCode())){
-// if (rbResponse.getData() != null){
-// JSONObject smsObject = rbResponse.getData();
-// String amount = smsObject.get("amount") == null ? "" : String.valueOf(smsObject.get("amount"));
-// String expireTime = smsObject.get("expireTime") == null ? "" : String.valueOf(smsObject.get("expireTime"));
-// smsApprovalNotify(amount,expireTime,customerApplyOrder.getPhone());
-// }
-// }
-// }
- h5Url = refreshToUrl + "/pages/ys/qh-sign?partnerOrderNo="+ customerApplyOrder.getChnOrderId() + "&capitalId = 28" ;
}else{
//h5Url = rbH5Url + "&capitalId="+ capitalId + "&mobile=" + customerApplyOrder.getPhone();
h5Url = rbH5Url + "&capitalId="+ capitalId;
@@ -1507,28 +1490,7 @@
* @param phone
*/
public void smsNotify(String phone) {
- String content = "【乐享融】您申请的信用额已通过审核，请1小时内查看【" + smsNotifyUrl + "】 过期作废！拒收请回复R";
- boolean success = FirstMessage.sendSmsApprovalNotify(phone, content);
- if (!success) {
- log.info("进件时短信通知日志: 用户手机：" + phone + "原短信商" + "发送返回失败");
- throw new CommonException("进件时短信通知发送失败");
- }
- log.info("进件时短信通知日志: 用户手机：" + phone + "原短信商" + "发送返回成功");
- }
-
- /**
- * 提供我来贷进件发送短信
- * @param phone
- */
- public void smsApprovalNotify(String one,String two,String phone) {
-// String content = "您申请的信用额已通过审核，请1小时内查看【" + smsNotifyUrl + "】 过期作废！拒收请回复R";
- String content = "【乐享融】你申请的信用额度【"+ one +"】于【"+ two +"】已通过审核：前往 【" + smsNotifyUrl + "】 提取贷款,拒收请回复R";
- boolean success = FirstMessage.sendSmsApprovalNotify(phone, content);
- log.info("青花优品进件通过手机号短信通知日志: 用户手机：" + phone + "原短信商" + "验证码发送返回成功");
- if (!success) {
- log.info("青花优品进件通过手机号短信通知日志: 用户手机：" + phone + "原短信商" + "验证码发送返回失败");
- throw new CommonException("验证码发送失败");
- }
-
+ String content = "您申请的信用额已通过审核，请1小时内查看【" + smsNotifyUrl + "】 过期作废！拒收请回复R";
+ ShanDongMessageSendUtil.sendSMSContent(phone, content);
}
}
--
Gitblit v1.9.3