From 3bf6735432727c36347d3456ee4f95881da6917e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 10 Aug 2025 23:47:09 +0800
Subject: [PATCH] 1
---
.idea/inspectionProfiles/Project_Default.xml | 2
src/main/java/project/c2c/data/loadcache/C2cLoadCacheService.java | 196 ++++++++++++++++++++++++------------------------
src/main/java/project/web/api/LocalUserController.java | 7 +
src/main/java/project/web/api/UserWalletAddressController.java | 2
src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java | 14 ---
5 files changed, 106 insertions(+), 115 deletions(-)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 5db292a..6d4ac50 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,6 +3,8 @@
<option name="myName" value="Project Default" />
<inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/src/main/java/project/c2c/data/loadcache/C2cLoadCacheService.java b/src/main/java/project/c2c/data/loadcache/C2cLoadCacheService.java
index 8027a99..8f622c7 100644
--- a/src/main/java/project/c2c/data/loadcache/C2cLoadCacheService.java
+++ b/src/main/java/project/c2c/data/loadcache/C2cLoadCacheService.java
@@ -32,11 +32,11 @@
private RedisHandler redisHandler;
private JdbcTemplate jdbcTemplate;
- private C2cTranslateService c2cTranslateService;
+// private C2cTranslateService c2cTranslateService;
public void loadcache() {
loadC2cPaymentMethodConfig();
- loadC2cTranslate();
+// loadC2cTranslate();
loadC2cPaymentMethod();
loadC2cUser();
loadC2cUserParamBaseSet();
@@ -68,99 +68,99 @@
this.redisHandler.setSync(RedisKeys.C2C_PAYMENT_METHOD_CONFIG_ID_TYPE, map);
}
- /*
- * 加载 C2C翻译
- */
- public void loadC2cTranslate() {
-
- // 所有的要翻译内容集合
- Set<String> contentSet = new HashSet<String>();
-
- // 支付方式类型名称列表
- List<String> nameList = this.c2cTranslateService.getAllPaymentMethodTypeName();
- for (int i = 0; i < nameList.size(); i++) {
- String name = nameList.get(i);
- if (null != name) {
- contentSet.add(name);
- }
- }
-
- // 获取所有的支付方式模板
- String sql = "SELECT * FROM T_C2C_PAYMENT_METHOD_CONFIG";
- List<C2cPaymentMethodConfig> list = jdbcTemplate.query(sql, RecordObjectMapper.newInstance(C2cPaymentMethodConfig.class));
-
- for (int i = 0; i < list.size(); i++) {
- C2cPaymentMethodConfig config = list.get(i);
- if (null != config) {
- if (StringUtils.isNotEmpty(config.getMethodName())) {
- contentSet.add(config.getMethodName());
- }
- if (StringUtils.isNotEmpty(config.getParamName1())) {
- contentSet.add(config.getParamName1());
- }
- if (StringUtils.isNotEmpty(config.getParamName2())) {
- contentSet.add(config.getParamName2());
- }
- if (StringUtils.isNotEmpty(config.getParamName3())) {
- contentSet.add(config.getParamName3());
- }
- if (StringUtils.isNotEmpty(config.getParamName4())) {
- contentSet.add(config.getParamName4());
- }
- if (StringUtils.isNotEmpty(config.getParamName5())) {
- contentSet.add(config.getParamName5());
- }
- if (StringUtils.isNotEmpty(config.getParamName6())) {
- contentSet.add(config.getParamName6());
- }
- if (StringUtils.isNotEmpty(config.getParamName7())) {
- contentSet.add(config.getParamName7());
- }
- if (StringUtils.isNotEmpty(config.getParamName8())) {
- contentSet.add(config.getParamName8());
- }
- if (StringUtils.isNotEmpty(config.getParamName9())) {
- contentSet.add(config.getParamName9());
- }
- if (StringUtils.isNotEmpty(config.getParamName10())) {
- contentSet.add(config.getParamName10());
- }
- if (StringUtils.isNotEmpty(config.getParamName11())) {
- contentSet.add(config.getParamName11());
- }
- if (StringUtils.isNotEmpty(config.getParamName12())) {
- contentSet.add(config.getParamName12());
- }
- if (StringUtils.isNotEmpty(config.getParamName13())) {
- contentSet.add(config.getParamName13());
- }
- if (StringUtils.isNotEmpty(config.getParamName14())) {
- contentSet.add(config.getParamName14());
- }
- if (StringUtils.isNotEmpty(config.getParamName15())) {
- contentSet.add(config.getParamName15());
- }
- }
- }
-
- // 获取 所有的支付方式模板 翻译
- String sql1 = "SELECT * FROM T_C2C_TRANSLATE";
- List<C2cTranslate> list1 = jdbcTemplate.query(sql1, RecordObjectMapper.newInstance(C2cTranslate.class));
-
- for (int i = 0; i < list1.size(); i++) {
-
- C2cTranslate entity = list1.get(i);
- if (null != entity) {
-
- if (contentSet.contains(entity.getContent())) {
- this.redisHandler.setSync(RedisKeys.C2C_TRANSLATE_CONTENT_LANGUAGE + StringUtils.stringToUnicode(entity.getContent()) + entity.getLanguage(), entity);
- } else {
- // 不需要的翻译删除
- this.c2cTranslateService.delete(entity.getContent(), entity.getLanguage());
- }
- }
- }
- }
+// /*
+// * 加载 C2C翻译
+// */
+// public void loadC2cTranslate() {
+//
+// // 所有的要翻译内容集合
+// Set<String> contentSet = new HashSet<String>();
+//
+// // 支付方式类型名称列表
+// List<String> nameList = this.c2cTranslateService.getAllPaymentMethodTypeName();
+// for (int i = 0; i < nameList.size(); i++) {
+// String name = nameList.get(i);
+// if (null != name) {
+// contentSet.add(name);
+// }
+// }
+//
+// // 获取所有的支付方式模板
+// String sql = "SELECT * FROM T_C2C_PAYMENT_METHOD_CONFIG";
+// List<C2cPaymentMethodConfig> list = jdbcTemplate.query(sql, RecordObjectMapper.newInstance(C2cPaymentMethodConfig.class));
+//
+// for (int i = 0; i < list.size(); i++) {
+// C2cPaymentMethodConfig config = list.get(i);
+// if (null != config) {
+// if (StringUtils.isNotEmpty(config.getMethodName())) {
+// contentSet.add(config.getMethodName());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName1())) {
+// contentSet.add(config.getParamName1());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName2())) {
+// contentSet.add(config.getParamName2());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName3())) {
+// contentSet.add(config.getParamName3());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName4())) {
+// contentSet.add(config.getParamName4());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName5())) {
+// contentSet.add(config.getParamName5());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName6())) {
+// contentSet.add(config.getParamName6());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName7())) {
+// contentSet.add(config.getParamName7());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName8())) {
+// contentSet.add(config.getParamName8());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName9())) {
+// contentSet.add(config.getParamName9());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName10())) {
+// contentSet.add(config.getParamName10());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName11())) {
+// contentSet.add(config.getParamName11());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName12())) {
+// contentSet.add(config.getParamName12());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName13())) {
+// contentSet.add(config.getParamName13());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName14())) {
+// contentSet.add(config.getParamName14());
+// }
+// if (StringUtils.isNotEmpty(config.getParamName15())) {
+// contentSet.add(config.getParamName15());
+// }
+// }
+// }
+//
+// // 获取 所有的支付方式模板 翻译
+// String sql1 = "SELECT * FROM T_C2C_TRANSLATE";
+// List<C2cTranslate> list1 = jdbcTemplate.query(sql1, RecordObjectMapper.newInstance(C2cTranslate.class));
+//
+// for (int i = 0; i < list1.size(); i++) {
+//
+// C2cTranslate entity = list1.get(i);
+// if (null != entity) {
+//
+// if (contentSet.contains(entity.getContent())) {
+// this.redisHandler.setSync(RedisKeys.C2C_TRANSLATE_CONTENT_LANGUAGE + StringUtils.stringToUnicode(entity.getContent()) + entity.getLanguage(), entity);
+// } else {
+// // 不需要的翻译删除
+// this.c2cTranslateService.delete(entity.getContent(), entity.getLanguage());
+// }
+// }
+// }
+// }
/*
* 加载 C2C支付方式
@@ -384,8 +384,8 @@
this.jdbcTemplate = jdbcTemplate;
}
- public void setC2cTranslateService(C2cTranslateService c2cTranslateService) {
- this.c2cTranslateService = c2cTranslateService;
- }
+// public void setC2cTranslateService(C2cTranslateService c2cTranslateService) {
+// this.c2cTranslateService = c2cTranslateService;
+// }
}
diff --git a/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java b/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java
index 4b26b2e..c8c909c 100644
--- a/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java
+++ b/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java
@@ -67,7 +67,6 @@
try {
ContractOrder order = contractOrderService.findByOrderNo(order_no);
if (order == null || !ContractOrder.STATE_SUBMITTED.equals(order.getState())) {
- logger.info("-----------到这里来了吗");
/**
* 状态已改变，退出处理
*/
@@ -75,7 +74,6 @@
}
List<Realtime> list = this.dataService.realtime(order.getSymbol());
if (list.size() == 0) {
- logger.info("-----------去你妈退出了");
return;
}
Realtime realtime = list.get(0);
@@ -86,7 +84,6 @@
/*
* 0 买涨
*/
- logger.info("当前价格："+close+"---------价格："+Arith.add(order.getTrade_avg_price(), order.getPips()));
if (close >= Arith.add(order.getTrade_avg_price(), order.getPips())) {
settle(order, "profit", close);
}
@@ -126,8 +123,6 @@
double mul = Arith.mul(order.getDeposit_open(), order.getLever_rate());//仓位
double div = Arith.div(mul, order.getTrade_avg_price());//持有币的数量
double amount = Arith.mul(div, Arith.sub(currentPrice, order.getTrade_avg_price()));
- logger.info("---------盈亏金额："+amount);
- logger.info("---------盈亏："+profit_loss);
RedisHandler redisHandler = getRedisHandler();
if ("profit".equals(profit_loss)) {
/**
@@ -259,8 +254,6 @@
}else{
totleMoney = Double.parseDouble(money.toString());
}
- logger.info("---------全仓强平任务----------------");
- logger.info("-------------------------:"+Arith.add(profit,totleMoney));
if (Arith.add(profit,totleMoney) <= 0) {
redisHandler.setSync("MONEY_CONTRACT_PROFIT_"+order.getPartyId().toString(), 0);
/**
@@ -278,10 +271,8 @@
extracted(order, wallet, redisHandler);
}
} else {
- logger.info("---------进入单个持仓----------------");
if (order.getProfit() < 0 && (Arith.div(order.getDeposit(), Math.abs(order.getProfit())) <= Arith
.div(order_close_line, 100))) {
- logger.info("---------进入强平了----------------");
/**
* 低于系统默认平仓线，进行强平
*/
@@ -299,25 +290,20 @@
// 开启事务
status = transactionManager.getTransaction(new DefaultTransactionDefinition());
- logger.info("----------我来更新钱包了");
wallet.setMoney(0);
redisHandler.setSync(WalletRedisKeys.WALLET_PARTY_ID + wallet.getPartyId().toString(), wallet);
- logger.info("-------wallet:" + wallet.getPartyId());
// 更新数据库
int update = jdbcTemplate.update("UPDATE T_WALLET SET MONEY=ROUND(?,8) WHERE PARTY_ID=?", 0, wallet.getPartyId().toString());
- logger.info("--------cnm跟新了几条：" + update);
// 保存钱包信息
Wallet ww = this.walletService.saveWalletByPartyId(order.getPartyId().toString());
- logger.info("-----------到底他妈是什么值：" + ww.getMoney());
// 更新 redis
redisHandler.setSync("PARTY_ID_MONEY_" + wallet.getPartyId().toString(), wallet.getMoney());
// 提交事务
transactionManager.commit(status);
- logger.info("----------更新完了");
} catch (Exception e) {
// 回滚事务
diff --git a/src/main/java/project/web/api/LocalUserController.java b/src/main/java/project/web/api/LocalUserController.java
index aecffab..1837add 100644
--- a/src/main/java/project/web/api/LocalUserController.java
+++ b/src/main/java/project/web/api/LocalUserController.java
@@ -395,6 +395,7 @@
String verifcode = request.getParameter("verifcode");
// 注册类型：1/手机；2/邮箱；3/用户名；
String type = request.getParameter("type");
+ String phone = request.getParameter("phone").toString();
// 资金密码选填，不填默认 000000
String safeword = request.getParameter("safeword").replace(" ", "");
String re_safeword = request.getParameter("re_safeword").replace(" ", "");
@@ -414,7 +415,9 @@
if (StringUtils.isEmptyString(username)) {
throw new BusinessException("用户名不能为空");
}
-
+ if (StringUtils.isEmptyString(phone)) {
+ throw new BusinessException("手机号不能为空");
+ }
if (StringUtils.isEmptyString(password)) {
throw new BusinessException("登录密码不能为空");
}
@@ -484,7 +487,7 @@
reg.setPassword(password);
reg.setSafeword(safeword);
reg.setReco_usercode(usercode);
-
+ reg.setPhone(phone);
this.localUserService.saveRegisterNoVerifcode(reg, type);
SecUser secUser = this.secUserService.findUserByLoginName(username);
diff --git a/src/main/java/project/web/api/UserWalletAddressController.java b/src/main/java/project/web/api/UserWalletAddressController.java
index fbbaee9..5ebf10b 100644
--- a/src/main/java/project/web/api/UserWalletAddressController.java
+++ b/src/main/java/project/web/api/UserWalletAddressController.java
@@ -74,7 +74,7 @@
private final String gateway = "https://sig11.udun.io";
private final String merchantKey = "7fd79e4ed59e7c31e1fa2e13d64f7e6c";
private final String merchantId = "319563";
- private final String defaultCallBackUrl = "https://m.deepeu.io/wap/api/user!rechargeCallback.action";
+ private final String defaultCallBackUrl = "https://m.deepeu.de/wap/api/user!rechargeCallback.action";
--
Gitblit v1.9.3