From f9ea0dcfb4bf3665caab910e0239d5048a3005fc Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 19 Sep 2025 10:37:36 +0800
Subject: [PATCH] 9.17
---
trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java | 2 +-
trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java | 5 +++--
trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java | 16 +++++++++++-----
trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java | 4 ++--
trading-order-admin/src/main/resources/config/system.properties | 16 ++++++++--------
5 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java b/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
index 103fedc..ec7e7b4 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
@@ -35,12 +35,12 @@
/**
* Callback 充值
*/
- private final String defaultCallBackUrl = "https://mdjysapi.yanshiz.com/api/channelBlockchain!rechargeCallback.action";
+ private final String defaultCallBackUrl = "https://api.stakecube-pro.com/api/channelBlockchain!rechargeCallback.action";
/**
* Callback 提币
*/
- private final String withdrawCallBackUrl = "https://mdjysapi.yanshiz.com/api/withdraw/withdrawCallback.action";
+ private final String withdrawCallBackUrl = "https://api.stakecube-pro.com/api/withdraw/withdrawCallback.action";
diff --git a/trading-order-admin/src/main/resources/config/system.properties b/trading-order-admin/src/main/resources/config/system.properties
index 050f89f..688b7ac 100644
--- a/trading-order-admin/src/main/resources/config/system.properties
+++ b/trading-order-admin/src/main/resources/config/system.properties
@@ -9,13 +9,13 @@
-email.host=smtp.gmail.com
-email.username=coinzne.com@gmail.com
-email.password=pqupwyxoqedhxlfq
-email.from= smtp.gmail.com
+#email.host=smtp.gmail.com
+#email.username=coinzne.com@gmail.com
+#email.password=pqupwyxoqedhxlfq
+#email.from= smtp.gmail.com
-#email.host=mail.45678.cf
-#email.username=support@StakeCubePro.com
-#email.password=@Asd156324
-#email.from=support@StakeCubePro.com
\ No newline at end of file
+email.host=smtp.zoho.com.cn
+email.username=support@stakecubepro.cc
+email.password=Llyp82nlf.
+email.from=support@stakecubepro.cc
\ No newline at end of file
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
index 64067a8..49b4a13 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
@@ -7,6 +7,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
import java.util.Date;
@@ -29,11 +30,11 @@
private String userId;
@ApiModelProperty("申购数量")
- private Integer subscribeNums;
+ private Long subscribeNums;
@ApiModelProperty("中签数量")
- private Integer ballotNumber;
+ private Long ballotNumber;
@ApiModelProperty("状态：1、已认购，2、未中签，3、已中签，4、已缴纳 5.已分发")
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
index 20741b1..ccf78f0 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
@@ -186,7 +186,7 @@
} else if (model.getStatus() == 3) { //中签
//已经预支付
if(ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
- int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
+ long applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
if(applyNumber > 0) {
//退回资金
BigDecimal refundPrice = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
index 8ddc78e..92dd1c1 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
@@ -77,11 +77,7 @@
// String smsbao_sign = sysparaService.find("smsbao_sign").getValue();
// 短信发送文本[TEST]code is ：{0}
- String send_code_text = this.sysparaService.find("send_code_text").getSvalue();
- if (StringUtils.isNullOrEmpty(send_code_text)) {
- logger.error("send_code_text 未配置");
- return;
- }
+ String send_code_text;
/**
* 是否每次发送的code都不一样
@@ -100,6 +96,11 @@
String content = MessageFormat.format("code is ：{0}", new Object[] { code });
if (target.indexOf("@") == -1) {
+ send_code_text = this.sysparaService.find("send_code_text").getSvalue();
+ if (StringUtils.isNullOrEmpty(send_code_text)) {
+ logger.error("send_code_text 未配置");
+ return;
+ }
/**
* 发送的短信接口类型 tiantian---天天---smsSendService--->>>>--
* moduyun---摩杜云---smsSingleSender
@@ -169,6 +170,11 @@
}
} else {
+ send_code_text = this.sysparaService.find("email_send_code_text").getSvalue();
+ if (StringUtils.isNullOrEmpty(send_code_text)) {
+ logger.error("email_send_code_text 未配置");
+ return;
+ }
/**
* 邮件
*/
--
Gitblit v1.9.3