From 1c6748cbef6bf2348106b27fb47a74efff8a8b2e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 10 Sep 2024 14:16:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 6 +++---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 6 +++++-
src/main/java/com/nq/service/impl/UserIndexPositionServiceImpl.java | 6 +++---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 19 +++++++------------
src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java | 3 +++
5 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserIndexPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserIndexPositionServiceImpl.java
index 1001fdf..9d7292b 100644
--- a/src/main/java/com/nq/service/impl/UserIndexPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserIndexPositionServiceImpl.java
@@ -94,9 +94,9 @@
User user = this.userMapper.selectById(userId);
/*实名认证开关开启*/
SiteProduct siteProduct = iSiteProductService.getProductSetting();
- if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
- return ServerResponse.createByErrorMsg("下单失败，请先实名认证");
- }
+// if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
+// return ServerResponse.createByErrorMsg("下单失败，请先实名认证");
+// }
if(siteProduct.getHolidayDisplay()){
return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
diff --git a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
index 3f8c738..347b70d 100644
--- a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
@@ -97,6 +97,9 @@
if (userAssets.getAvailableBalance().compareTo(amount) < 0) {
return ServerResponse.createByErrorMsg("订单失败，余额不足", request);
}
+ if(buyNum<100){
+ return ServerResponse.createByErrorMsg("最低购买数量"+siteSetting.getBuyMinNum(), request);
+ }
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 9344aa9..a4af636 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -132,9 +132,9 @@
SiteProduct siteProduct = iSiteProductService.getProductSetting();
User user = this.iUserService.getCurrentRefreshUser(request);
- if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
- return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
- }
+// if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+// return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
+// }
// 手续费率
BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
@@ -158,17 +158,12 @@
}
}
- StockConfig mainBuyConfig = iStockConfigServices.queryByKey(EConfigKey.MIN_BUY.getCode());
-
- if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
- return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
+ SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
+ if(buyNum<siteSetting.getBuyMinNum()){
+ return ServerResponse.createByErrorMsg("最低购买数量"+siteSetting.getBuyMinNum(), request);
}
-
UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
- StockConfig maxBuyConfig = iStockConfigServices.queryByKey(EConfigKey.MAX_BUY.getCode());
- if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
- return ServerResponse.createByErrorMsg("最高购买数量"+maxBuyConfig.getCValue(), request);
- }
+
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 77670e1..91e7c44 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -89,9 +89,9 @@
.eq("code", model.getNewCode()).eq("type",model.getType()));
//实名认证开关
SiteProduct siteProduct = iSiteProductService.getProductSetting();
- if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
- return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
- }
+// if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+// return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
+// }
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 787e089..a3beb29 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import com.nq.utils.timeutil.DateTimeUtil;
+import com.nq.utils.translate.GoogleTranslateUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
@@ -182,7 +183,10 @@
List<UserWithdraw> userWithdraws = this.userWithdrawMapper.findUserWithList(user.getId(), withStatus);
-
+ userWithdraws.forEach(f->{
+ f.setBankName(new GoogleTranslateUtil().translate(f.getBankName(),request.getHeader("lang")));
+ f.setBankAddress(new GoogleTranslateUtil().translate(f.getBankAddress(),request.getHeader("lang")));
+ });
PageInfo pageInfo = new PageInfo(userWithdraws);
--
Gitblit v1.9.3