From 6404cb07e5281cfd901267c4fd560ba89bd5e2fd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ysz' into ysz
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index e1c3e85..0293bd3 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -196,22 +196,22 @@
SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
StockRealTimeBean stockRealTimeBean = RedisKeyUtil.getCacheRealTimeStock(stock);
BigDecimal pcp = new BigDecimal(stockRealTimeBean.getPcp());
- SiteVipRob siteVipRob = iSiteVipRobService.getByStockCode(stock.getStockCode());
- // 检查VIP抢筹功能是否开启且用户符合条件
- if (null != siteVipRob && siteVipRob.getStatus() == 1 && pcp.compareTo(siteVipRob.getStockChg()) >= 0) {
- // 检查密码是否为空
- if (StringUtils.isBlank(password)) {
- return ServerResponse.createByErrorMsg("VIP抢筹秘钥错误", request);
- }
- // 检查交易数量是否达到最低要求
- if (buyNum < siteVipRob.getLowestTrade()) {
- return ServerResponse.createByErrorMsg("VIP抢筹秘最低交易数量为" + siteVipRob.getLowestTrade(), request);
- }
- // 检查VIP密码是否正确
- if (!siteSetting.getVipPassword().equals(password)) {
- return ServerResponse.createByErrorMsg("VIP抢筹秘钥错误", request);
- }
- }
+// SiteVipRob siteVipRob = iSiteVipRobService.getByStockCode(stock.getStockCode());
+// // 检查VIP抢筹功能是否开启且用户符合条件
+// if (null != siteVipRob && siteVipRob.getStatus() == 1 && pcp.compareTo(siteVipRob.getStockChg()) >= 0) {
+// // 检查密码是否为空
+// if (StringUtils.isBlank(password)) {
+// return ServerResponse.createByErrorMsg("VIP抢筹秘钥错误", request);
+// }
+// // 检查交易数量是否达到最低要求
+// if (buyNum < siteVipRob.getLowestTrade()) {
+// return ServerResponse.createByErrorMsg("VIP抢筹秘最低交易数量为" + siteVipRob.getLowestTrade(), request);
+// }
+// // 检查VIP密码是否正确
+// if (!siteSetting.getVipPassword().equals(password)) {
+// return ServerResponse.createByErrorMsg("VIP抢筹秘钥错误", request);
+// }
+// }
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
@@ -1262,10 +1262,7 @@
userPosition.setStockCode(stock.getStockCode());
userPosition.setStockSpell(stock.getStockSpell());
userPosition.setStockName(userStockSubscribe.getNewName());
- StringBuffer gid = new StringBuffer();
- gid.append(stockSubscribe.getStockType()!=null?stockSubscribe.getStockType():"");
- gid.append(userStockSubscribe.getNewCode()!=null?userStockSubscribe.getNewCode():"stock code invaild");
- userPosition.setStockGid(gid.toString());
+ userPosition.setStockGid(stock.getStockType());
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(new Date());
userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
@@ -1682,7 +1679,7 @@
userPosition.setOrderSpread(BigDecimal.ZERO);
userPositionMapper.insert(userPosition);
- userAssetsServices.availablebalanceChange(EStockType.US.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
+ userAssetsServices.availablebalanceChange(stockDz.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
return ServerResponse.createBySuccess("购买成功", request);
}
--
Gitblit v1.9.3