From 8f7985d7764a0aad24bd593ac5ea47b7fc290961 Mon Sep 17 00:00:00 2001
From: Sunshine <546230292@qq.com>
Date: Tue, 05 Nov 2024 00:20:13 +0800
Subject: [PATCH] 测试提交
---
src/main/java/com/nova/sankuai/infra/utils/wolaidai/WolaidaiUtil.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
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 023050f..42e8aa6 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,6 +17,7 @@
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;
@@ -80,6 +81,9 @@
@Value("${rongbei.h5HalfUrl}")
private String h5HalfUrl; // 融呗非半流程h5Url
+
+ @Value("${front.refreshToUrl}")
+ private String refreshToUrl; // 前端跳转地址
@Value("${rongbei.wolaidai.url}")
private String wldUrl; // 我来贷URL
@@ -344,7 +348,6 @@
break;
}
}
-
return basicInfo; // 返回配置映射
}
@@ -395,7 +398,7 @@
JSON.toJSONString(applyDto);
decryptStr = JSON.toJSONString(applyDto);
//发送短信通知（等待供应商审批短信模板 申请完后在恢复注释）
- //smsNotify(profileDictDto.getPhone());
+ smsNotify(profileDictDto.getPhone());
}
String bizDataStr = "";
String fBizDataStr = "";
@@ -413,9 +416,22 @@
Long capitalId = customerApplyOrder.getCapitalId();
String h5Url = "";
// 如果是慧钱，随易花，e时贷，好汇推，则转为乐享融的指定id：28
- if (capitalId == 12L || capitalId == 41L || capitalId == 36L || capitalId == 25L || capitalId == 4L) {
+ if (capitalId == 12L || capitalId == 41L || capitalId == 36L || capitalId == 25L) {
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;
@@ -1300,7 +1316,28 @@
* @param phone
*/
public void smsNotify(String phone) {
- String content = "您申请的信用额已通过审核，请1小时内查看【" + smsNotifyUrl + "】 过期作废！拒收请回复R";
- ShanDongMessageSendUtil.sendSMSContent(phone, content);
+ 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("验证码发送失败");
+ }
+
}
}
--
Gitblit v1.9.3