From e18f00f089d32db1c3db6702731172e421ab640f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 24 Jul 2025 15:01:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java | 16 ++++++++--------
src/main/java/com/nq/utils/SymmetricCryptoUtil.java | 2 +-
src/main/java/com/nq/service/impl/UserAssetsServices.java | 12 +++++++++---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 2 +-
src/main/java/com/nq/controller/UserApiController.java | 23 ++++++++++++++++++++++-
5 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index baf50d6..89585cf 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -173,7 +173,28 @@
Page<MoneyLog> moneyLogPage = moneyLogMapper.selectPage(page1, queryWrapper);
List<MoneyLog> records = moneyLogPage.getRecords();
records.forEach(f->{
- f.setDescs( new GoogleTranslateUtil().translate(f.getDescs(),request.getHeader("lang")));
+ if(request.getHeader("lang").equals("ja")){
+ String descs = "";
+ if(f.getDescs().equals("平仓返回保证金")){
+ descs = "証拠金の返還";
+ }else if(f.getDescs().equals("平仓")){
+ descs = "ポジション決済";
+ }else if(f.getDescs().equals("手续费")){
+ descs = "手数料";
+ }else if(f.getDescs().equals("购买")){
+ descs = "購入";
+ }else if(f.getDescs().equals("提现")){
+ descs = "出金";
+ }else if(f.getDescs().equals("充值")){
+ descs = "入金";
+ }else{
+ descs = new GoogleTranslateUtil().translate(f.getDescs(),request.getHeader("lang"));
+ }
+ f.setDescs(descs);
+ }else{
+ f.setDescs( new GoogleTranslateUtil().translate(f.getDescs(),request.getHeader("lang")));
+ }
+
});
moneyLogPage.setRecords(records);
return ServerResponse.createBySuccess(moneyLogPage);
diff --git a/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java b/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java
index 0e18cb2..043ed8b 100644
--- a/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java
@@ -92,14 +92,14 @@
PageHelper.startPage(pageNum, pageSize);
List<SiteArticle> siteArticles = this.siteArticleMapper.list(artTitle, artType);
for (SiteArticle siteArticle : siteArticles) {
- if (request.getHeader("lang") != null && !request.getHeader("lang").equals("zh-CN") && !request.getHeader("lang").equals("tww") && !request.getHeader("lang").equals("")) {
- GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
- try {
- siteArticle.setArtTitle(googleTranslateUtil.translate(siteArticle.getArtTitle(), request.getHeader("lang")));
- } catch (Exception e) {
- log.error("翻译失败");
- }
- }
+// if (request.getHeader("lang") != null && !request.getHeader("lang").equals("zh-CN") && !request.getHeader("lang").equals("tww") && !request.getHeader("lang").equals("")) {
+// GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
+// try {
+// siteArticle.setArtTitle(googleTranslateUtil.translate(siteArticle.getArtTitle(), request.getHeader("lang")));
+// } catch (Exception e) {
+// log.error("翻译失败");
+// }
+// }
}
PageInfo pageInfo = new PageInfo(siteArticles);
return ServerResponse.createBySuccess(pageInfo);
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index df8ffdd..358ca57 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -465,7 +465,7 @@
@Override
public ServerResponse getIndexData() {
- Object object = HttpUtil.get("http://api-jp.js-stock.top/indices?country_id=35&key=82G6ecXGSN2O1lZJSNSD");
+ Object object = HttpUtil.get("http://api-jp.js-stock.top/indices?country_id=35&key=k281ultTZyeN7mdUFyZL");
Gson gson = new Gson();
List<IndexDateBo> dataList = gson.fromJson(object.toString(), new TypeToken<List<IndexDateBo>>(){}.getType());
List<String> targetIds = Arrays.asList("535569508", "535569510", "535658223");
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index fa18738..974f5b1 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -205,9 +205,15 @@
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
- userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
- userAssets.setAmountToBeCovered(availableBalance.negate());
+ BigDecimal subtract = amount.subtract(userAssets.getHandlingChargeWritten());
+ if(subtract.compareTo(BigDecimal.ZERO) >= 0) {
+ BigDecimal decimal = amount.subtract(userAssets.getAmountToBeCovered());
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.subtract(userAssets.getHandlingChargeWritten())));
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
+ userAssets.setAmountToBeCovered(decimal.negate());
+ }else{
+ userAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().subtract(amount));
+ }
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
diff --git a/src/main/java/com/nq/utils/SymmetricCryptoUtil.java b/src/main/java/com/nq/utils/SymmetricCryptoUtil.java
index 0906888..79b3f19 100644
--- a/src/main/java/com/nq/utils/SymmetricCryptoUtil.java
+++ b/src/main/java/com/nq/utils/SymmetricCryptoUtil.java
@@ -25,7 +25,7 @@
public static void main(String[] args) {
String encryptData = encryptFromString("zdm321123.", Mode.CBC, Padding.ZeroPadding);
System.out.println("加密：" + encryptData);
- String decryptData = decryptFromString(encryptData, Mode.CBC, Padding.ZeroPadding);
+ String decryptData = decryptFromString("c2l1335xRtkrWL4KVRBTHw==", Mode.CBC, Padding.ZeroPadding);
System.out.println("解密：" + decryptData);
}
--
Gitblit v1.9.3