From 6b0035bd7726c159c02e506d76f936e6e8206146 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Tue, 09 Dec 2025 15:05:41 +0800
Subject: [PATCH] 修改
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 320 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 290 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 8dde425..61f7920 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -28,6 +28,7 @@
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -557,7 +558,7 @@
SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
if (siteSetting == null) {
log.error("平倉出錯，網站設置表不存在");
- return ServerResponse.createByErrorMsg("下單失敗，系統設置錯誤");
+ return ServerResponse.createByErrorMsg("下单失败，系统设置错误");
}
SiteProduct siteProduct = iSiteProductService.getProductSetting();
UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
@@ -572,7 +573,7 @@
log.info("是否在上午交易時間 = {} 是否在下午交易時間 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
if (!am_flag && !pm_flag) {
- return ServerResponse.createByErrorMsg("平倉失敗，不在交易時段內");
+ return ServerResponse.createByErrorMsg("下单失败，系统设置错误");
}
} else if (userPosition.getStockGid().contains("hk")) {
String am_begin = siteSetting.getTransAmBeginhk();
@@ -595,44 +596,44 @@
boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
log.info("是否在上午交易時間 = {} 是否在下午交易時間 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
if (!am_flag && !pm_flag) {
- return ServerResponse.createByErrorMsg("平倉失敗，不在交易時段內");
+ return ServerResponse.createByErrorMsg("平仓失败，不在交易时段内");
}
}
if (siteProduct.getHolidayDisplay()) {
- return ServerResponse.createByErrorMsg("周末或節假日不能交易！");
+ return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
}
}
if (userPosition == null) {
- return ServerResponse.createByErrorMsg("平倉失敗，訂單不存在");
+ return ServerResponse.createByErrorMsg("平仓失败，订单不存在");
}
User user = this.userMapper.selectByPrimaryKey(userPosition.getUserId());
if (user == null) {
- return ServerResponse.createByErrorMsg("平倉失敗，用戶不存在");
+ return ServerResponse.createByErrorMsg("平仓失败，用户不存在");
}
/*實名認證開關開啟*/
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("平倉失敗，用戶已被鎖定");
+ return ServerResponse.createByErrorMsg("平仓失败，用户已被锁定");
}
if (userPosition.getSellOrderId() != null) {
- return ServerResponse.createByErrorMsg("平倉失敗，此訂單已平倉");
+ return ServerResponse.createByErrorMsg("平仓失败，此订单已平仓");
}
if (1 == userPosition.getIsLock().intValue()) {
- return ServerResponse.createByErrorMsg("平倉失敗 " + userPosition.getLockMsg());
+ return ServerResponse.createByErrorMsg("平仓失败 " + userPosition.getLockMsg());
}
if (!DateTimeUtil.isCanSell(userPosition.getBuyOrderTime(), siteSetting.getCantSellTimes().intValue())) {
// return ServerResponse.createByErrorMsg(siteSetting.getCantSellTimes() + "分鐘內不能平倉");
- return ServerResponse.createByErrorMsg("當日成交不可平倉");
+ return ServerResponse.createByErrorMsg("当日成交不可平仓");
}
// if (DateTimeUtil.sameDate(DateTimeUtil.getCurrentDate(),userPosition.getBuyOrderTime())) {
@@ -680,7 +681,7 @@
// }
if (stockListVO.getNowPrice() == null) {
- return ServerResponse.createByErrorMsg("平倉失敗，獲取股票信息失敗");
+ return ServerResponse.createByErrorMsg("平仓失败，获取股票信息失败");
}
now_price = new BigDecimal(stockListVO.getNowPrice());
@@ -688,7 +689,7 @@
// BigDecimal now_price = new BigDecimal(stockListVO.getNowPrice());
if (now_price.compareTo(new BigDecimal("0")) != 1) {
log.error("股票 = {} 收到報價 = {}", userPosition.getStockName(), now_price);
- return ServerResponse.createByErrorMsg("報價0，平倉失敗，請稍後再試");
+ return ServerResponse.createByErrorMsg("报价0，平仓失败，请稍后再试");
}
double stock_crease = stockListVO.getHcrate().doubleValue();
@@ -705,7 +706,7 @@
log.info("股票當前漲跌幅 = {} 跌停幅度 = {}", Double.valueOf(stock_crease), ztRate);
if ((new BigDecimal(String.valueOf(stock_crease))).compareTo(ztRate) == 0 && "買漲"
.equals(userPosition.getOrderDirection())) {
- return ServerResponse.createByErrorMsg("當前股票已跌停不能賣出");
+ return ServerResponse.createByErrorMsg("当前股票已跌停不能卖出");
}
Integer buy_num = userPosition.getOrderNum();
@@ -715,13 +716,15 @@
BigDecimal all_sell_amt = now_price.multiply(new BigDecimal(buy_num.intValue()));
BigDecimal profitLoss = new BigDecimal("0");
- if ("買漲".equals(userPosition.getOrderDirection())) {
+ if ("买涨".equals(userPosition.getOrderDirection())) {
log.info("買賣方向：{}", "漲");
- profitLoss = all_sell_amt.subtract(all_buy_amt).multiply(new BigDecimal(userPosition.getOrderLever())).setScale(2,4);
+// profitLoss = all_sell_amt.subtract(all_buy_amt).multiply(new BigDecimal(userPosition.getOrderLever())).setScale(2,4);
+ profitLoss = all_sell_amt.subtract(all_buy_amt).setScale(2,4);
} else {
log.info("買賣方向：{}", "跌");
- profitLoss = all_buy_amt.subtract(all_sell_amt).multiply(new BigDecimal(userPosition.getOrderLever())).setScale(2,4);
+// profitLoss = all_buy_amt.subtract(all_sell_amt).multiply(new BigDecimal(userPosition.getOrderLever())).setScale(2,4);
+ profitLoss = all_buy_amt.subtract(all_sell_amt).setScale(2,4);
}
log.info("買入總金額 = {} , 賣出總金額 = {} , 盈虧 = {}", new Object[]{all_buy_amt, all_sell_amt, profitLoss});
@@ -742,11 +745,11 @@
log.info("點差費 = {}", spreadRatePrice);
BigDecimal sell_fee_amt = all_sell_amt.multiply(siteSetting.getSellFee()).setScale(2, 4);
- log.info("賣出手續費 = {}", sell_fee_amt);
+ log.info("卖出手续费 = {}", sell_fee_amt);
//總手續費= 買入手續費+賣出手續費+印花稅+遞延費+點差費
BigDecimal all_fee_amt = buy_fee_amt.add(sell_fee_amt).add(orderSpread).add(orderStayFee).add(spreadRatePrice);
- log.info("總的手續費費用 = {}", all_fee_amt);
+ log.info("总的手续费费用 = {}", all_fee_amt);
userPosition.setSellOrderId(GeneratePosition.getPositionId());
userPosition.setSellOrderPrice(now_price);
@@ -762,10 +765,10 @@
int updatePositionCount = this.userPositionMapper.updateByPrimaryKeySelective(userPosition);
if (updatePositionCount > 0) {
- log.info("【用戶平倉】修改浮動盈虧記錄成功");
+ log.info("【用户平仓】修改浮动盈亏记录成功");
} else {
- log.error("用戶平倉】修改浮動盈虧記錄出錯");
- throw new Exception("用戶平倉】修改浮動盈虧記錄出錯");
+ log.error("用户平仓】修改浮动盈亏记录出错");
+ throw new Exception("用户平仓】修改浮动盈亏记录出错");
}
BigDecimal freez_amt = all_buy_amt.divide(new BigDecimal(userPosition.getOrderLever().intValue()), 2, 4);
@@ -792,9 +795,9 @@
ucd.setAgentName(user.getAgentName());
ucd.setUserId(user.getId());
ucd.setUserName(user.getRealName());
- ucd.setDeType("總盈虧");
+ ucd.setDeType("总盈亏");
ucd.setDeAmt(all_profit);
- ucd.setDeSummary("賣出股票，" + userPosition.getStockCode() + "/" + userPosition.getStockName() + ",占用本金：" + freez_amt + ",總手續費：" + all_fee_amt + ",遞延費：" + orderStayFee + ",印花稅：" + orderSpread + ",盈虧：" + profitLoss + "，總盈虧：" + all_profit);
+ ucd.setDeSummary("卖出股票，" + userPosition.getStockCode() + "/" + userPosition.getStockName() + ",占用本金：" + freez_amt + ",总手续费：" + all_fee_amt + ",递延费：" + orderStayFee + ",印花稅：" + orderSpread + ",盈亏：" + profitLoss + "，总盈亏：" + all_profit);
ucd.setAddTime(new Date());
ucd.setIsRead(Integer.valueOf(0));
@@ -811,8 +814,218 @@
throw new Exception("用戶平倉】保存明細記錄出錯");
}
- return ServerResponse.createBySuccessMsg("平倉成功！");
+ return ServerResponse.createBySuccessMsg("平仓成功！");
}
+
+ public ServerResponse sellbf(String positionSn, Integer quantity) throws Exception {
+ log.info("【用戶交易部分平倉】 positionSn = {} ， dotype = {}", positionSn, Integer.valueOf(quantity));
+
+ SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
+ if (siteSetting == null) {
+ log.error("平仓出错，网站设置表不存在");
+ return ServerResponse.createByErrorMsg("下单失败，系统设置错误");
+ }
+ SiteProduct siteProduct = iSiteProductService.getProductSetting();
+ UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
+ //部分平仓数量等于订单总数量，则调用全平接口
+ if(quantity.equals(userPosition.getOrderNum())){
+ return sell(positionSn,1);
+ }
+ //校验时间
+ String am_begin = siteSetting.getTransAmBegin();
+ String am_end = siteSetting.getTransAmEnd();
+ String pm_begin = siteSetting.getTransPmBegin();
+ String pm_end = siteSetting.getTransPmEnd();
+ boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
+ boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
+ log.info("是否在上午交易時間 = {} 是否在下午交易時間 = {}", Boolean.valueOf(am_flag), Boolean.valueOf(pm_flag));
+ if (!am_flag && !pm_flag) {
+ return ServerResponse.createByErrorMsg("平仓失败，不在交易时段内");
+ }
+ if (userPosition == null) {
+ return ServerResponse.createByErrorMsg("平仓失败，订单不存在");
+ }
+ User user = this.userMapper.selectByPrimaryKey(userPosition.getUserId());
+ if (user == null) {
+ return ServerResponse.createByErrorMsg("平仓失败，用户不存在");
+ }
+ /*實名認證開關開啟*/
+ if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
+
+ return ServerResponse.createByErrorMsg("平仓失败，用户已被锁定");
+
+ }
+ if (userPosition.getSellOrderId() != null) {
+ return ServerResponse.createByErrorMsg("平仓失败，此订单已平仓");
+ }
+ if (1 == userPosition.getIsLock().intValue()) {
+ return ServerResponse.createByErrorMsg("平仓失败 " + userPosition.getLockMsg());
+ }
+ if (!DateTimeUtil.isCanSell(userPosition.getBuyOrderTime(), siteSetting.getCantSellTimes().intValue())) {
+ return ServerResponse.createByErrorMsg("当日成交不可平仓");
+ }
+
+ BigDecimal now_price;
+ StockListVO stockListVO = new StockListVO();
+ //股票賣出的 價格 數據源
+ stockListVO = SinaStockApi.assembleLideStockListVO(LiDeDataUtils.getStock(userPosition.getStockCode()));
+ if (ObjectUtils.isEmpty(stockListVO)) {
+ stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(userPosition.getStockGid()));
+ }
+ if (stockListVO.getNowPrice() == null) {
+ return ServerResponse.createByErrorMsg("平仓失败，获取股票信息失败");
+ }
+ now_price = new BigDecimal(stockListVO.getNowPrice());
+
+ if (now_price.compareTo(new BigDecimal("0")) != 1) {
+ log.error("股票 = {} 收到報價 = {}", userPosition.getStockName(), now_price);
+ return ServerResponse.createByErrorMsg("报价0，平仓失败，请稍后再试");
+ }
+
+ double stock_crease = stockListVO.getHcrate().doubleValue();
+
+ BigDecimal zsPrice = new BigDecimal(stockListVO.getPreclose_px());
+
+ BigDecimal ztPrice = zsPrice.multiply(new BigDecimal("0.1")).add(zsPrice);
+ ztPrice = ztPrice.setScale(2, 4);
+ BigDecimal chaPrice = ztPrice.subtract(zsPrice);
+
+ BigDecimal ztRate = chaPrice.multiply(new BigDecimal("100")).divide(zsPrice, 2, 4);
+
+ ztRate = ztRate.negate();
+ log.info("股票當前漲跌幅 = {} 跌停幅度 = {}", Double.valueOf(stock_crease), ztRate);
+ if ((new BigDecimal(String.valueOf(stock_crease))).compareTo(ztRate) == 0 && "買漲"
+ .equals(userPosition.getOrderDirection())) {
+ return ServerResponse.createByErrorMsg("当前股票已跌停不能卖出");
+ }
+ if (quantity <= 0) {
+ return ServerResponse.createByErrorMsg("平仓失败， 平仓数量不可小于0");
+ }
+ if (quantity > userPosition.getOrderNum()) {
+ return ServerResponse.createByErrorMsg("平仓失败，平仓数量不可小于"+userPosition.getOrderNum());
+ }
+
+// Integer buy_num = userPosition.getOrderNum();
+ Integer buy_num = quantity;
+
+// BigDecimal all_buy_amt = userPosition.getOrderTotalPrice();
+ BigDecimal all_buy_amt = userPosition.getBuyOrderPrice().multiply(new BigDecimal(buy_num)).setScale(2,4);
+ BigDecimal all_sell_amt = now_price.multiply(new BigDecimal(buy_num.intValue()));
+
+ BigDecimal profitLoss = new BigDecimal("0");
+ if ("买涨".equals(userPosition.getOrderDirection())) {
+ log.info("買賣方向：{}", "漲");
+ profitLoss = all_sell_amt.subtract(all_buy_amt).setScale(2,4);
+ } else {
+ log.info("買賣方向：{}", "跌");
+ profitLoss = all_buy_amt.subtract(all_sell_amt).setScale(2,4);
+ }
+ log.info("買入總金額 = {} , 賣出總金額 = {} , 盈虧 = {}", new Object[]{all_buy_amt, all_sell_amt, profitLoss});
+
+ BigDecimal user_all_amt = user.getUserAmt();
+ BigDecimal user_enable_amt = user.getEnableAmt();
+ log.info("用戶原本總資金 = {} , 可用 = {}", user_all_amt, user_enable_amt);
+
+ BigDecimal buy_fee_amt = all_buy_amt.multiply(siteSetting.getBuyFee()).setScale(2,4);
+ log.info("買入手續費 = {}", buy_fee_amt);
+
+ BigDecimal orderSpread = all_buy_amt.multiply(siteSetting.getDutyFee()).setScale(2, 4);
+ log.info("印花稅 = {}", orderSpread);
+
+// BigDecimal orderStayFee = all_buy_amt.multiply(siteSetting.getStayFee()).setScale(2, 4);
+// log.info("遞延費 = {}", orderStayFee);
+//
+// BigDecimal spreadRatePrice = userPosition.getSpreadRatePrice();
+// log.info("點差費 = {}", spreadRatePrice);
+
+ BigDecimal sell_fee_amt = all_sell_amt.multiply(siteSetting.getSellFee()).setScale(2, 4);
+ log.info("賣出手續費 = {}", sell_fee_amt);
+
+ //總手續費= 買入手續費+賣出手續費+印花稅+遞延費+點差費
+// BigDecimal all_fee_amt = buy_fee_amt.add(sell_fee_amt).add(orderSpread).add(orderStayFee).add(spreadRatePrice);
+ BigDecimal all_fee_amt = buy_fee_amt.add(sell_fee_amt).add(orderSpread);
+ log.info("總的手續費費用 = {}", all_fee_amt);
+ //复制一条新订单
+ UserPosition userPositionNew = new UserPosition();
+ BeanUtils.copyProperties(userPosition, userPositionNew);
+ userPositionNew.setId(null);
+ userPositionNew.setBuyOrderId(GeneratePosition.getPositionId());
+ userPositionNew.setPositionSn(KeyUtils.getUniqueKey());
+ userPositionNew.setOrderNum(buy_num);
+ userPositionNew.setOrderTotalPrice(all_buy_amt);
+
+ userPositionNew.setSellOrderId(GeneratePosition.getPositionId());
+ userPositionNew.setSellOrderPrice(now_price);
+ userPositionNew.setSellOrderTime(new Date());
+
+ BigDecimal order_fee_all = buy_fee_amt.add(sell_fee_amt);
+ userPositionNew.setOrderFee(order_fee_all);
+ userPositionNew.setOrderSpread(orderSpread);
+
+ userPositionNew.setProfitAndLose(profitLoss);
+
+ BigDecimal all_profit = profitLoss.subtract(all_fee_amt);
+ userPositionNew.setAllProfitAndLose(all_profit);
+ userPositionMapper.insert(userPositionNew);
+ //修改原订单
+ userPosition.setOrderNum(userPosition.getOrderNum() - userPositionNew.getOrderNum());
+ userPosition.setOrderTotalPrice(userPosition.getOrderTotalPrice().subtract(userPositionNew.getOrderTotalPrice()));
+ userPosition.setOrderFee(userPosition.getOrderFee().subtract(buy_fee_amt));
+ userPosition.setOrderSpread(userPosition.getOrderSpread().subtract(orderSpread));
+
+ int updatePositionCount = this.userPositionMapper.updateByPrimaryKeySelective(userPosition);
+ if (updatePositionCount > 0) {
+ log.info("【用戶平倉】修改浮動盈虧記錄成功");
+ } else {
+ log.error("用戶平倉】修改浮動盈虧記錄出錯");
+ throw new Exception("用户平仓】修改浮动盈亏记录出错");
+ }
+
+ BigDecimal freez_amt = all_buy_amt.divide(new BigDecimal(userPositionNew.getOrderLever().intValue()), 2, 4);
+
+ BigDecimal reckon_all = user_all_amt.add(all_profit);
+ //修改用戶可用余額=當前可用余額+總盈虧+買入總金額+追加保證金
+ BigDecimal reckon_enable = user_enable_amt.add(all_profit).add(freez_amt).add(userPositionNew.getMarginAdd());
+
+ log.info("用戶平倉後的總資金 = {} , 可用資金 = {}", reckon_all, reckon_enable);
+ user.setUserAmt(reckon_all);
+ user.setEnableAmt(reckon_enable);
+ int updateUserCount = this.userMapper.updateByPrimaryKeySelective(user);
+ if (updateUserCount > 0) {
+ log.info("【用戶平倉】修改用戶金額成功");
+ } else {
+ log.error("用戶平倉】修改用戶金額出錯");
+ throw new Exception("【用户平仓】修改用户金额出错");
+ }
+
+ UserCashDetail ucd = new UserCashDetail();
+ ucd.setPositionId(userPosition.getId());
+ ucd.setAgentId(user.getAgentId());
+ ucd.setAgentName(user.getAgentName());
+ ucd.setUserId(user.getId());
+ ucd.setUserName(user.getRealName());
+ ucd.setDeType("总盈亏");
+ ucd.setDeAmt(all_profit);
+ ucd.setDeSummary("卖出股票，" + userPositionNew.getStockCode() + "/" + userPositionNew.getStockName() + ",占用本金：" + freez_amt + ",总手续费：" + all_fee_amt + ",递延费：" + 0 + ",印花稅：" + orderSpread + ",盈亏：" + profitLoss + "，总盈亏：" + all_profit);
+
+ ucd.setAddTime(new Date());
+ ucd.setIsRead(Integer.valueOf(0));
+
+ int insertSxfCount = this.userCashDetailMapper.insert(ucd);
+ if (insertSxfCount > 0) {
+ //核算代理收入-平倉手續費
+ iAgentAgencyFeeService.AgencyFeeIncome(2, userPositionNew.getPositionSn());
+ //核算代理收入-分紅
+ iAgentAgencyFeeService.AgencyFeeIncome(4, userPositionNew.getPositionSn());
+ log.info("【用戶平倉】保存明細記錄成功");
+ } else {
+ log.error("用戶平倉】保存明細記錄出錯");
+ throw new Exception("【用户平仓】保存明细记录出错");
+ }
+
+ return ServerResponse.createBySuccessMsg("平仓成功！");
+ }
+
//用户追加保证金操作
public ServerResponse addmargin(String positionSn, int doType, BigDecimal marginAdd) throws Exception {
@@ -1010,9 +1223,13 @@
if (ObjectUtils.isEmpty(stockListVO)) {
stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
}
- if (stockListVO.getNowPrice() == null) {
- stockListVO.setNowPrice("0");
+
+ if (stockListVO.getNowPrice() == null || new BigDecimal(stockListVO.getNowPrice()).compareTo(BigDecimal.ZERO) <= 0) {
+// stockListVO.setNowPrice("0");
+ stockListVO.setNowPrice(String.valueOf(position.getBuyOrderIdIndex()));
}
+
+
BigDecimal nowPrice = new BigDecimal(stockListVO.getNowPrice());
@@ -1629,6 +1846,8 @@
userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
userPositionVO.setNow_price(positionProfitVO.getNowPrice());
+ userPositionVO.setAllProfitAndLoseStr(positionProfitVO.getAllProfitAndLoseStr());
+ userPositionVO.setOrderTotalPrice(positionProfitVO.getOrderTotalPrice());
return userPositionVO;
@@ -1637,12 +1856,15 @@
public PositionProfitVO getPositionProfitVO(UserPosition position) {
BigDecimal profitAndLose = new BigDecimal("0");
BigDecimal allProfitAndLose = new BigDecimal("0");
+ String allProfitAndLoseStr = "";
String nowPrice = "";
+ BigDecimal orderTotalPrice = position.getOrderTotalPrice();
if (position.getSellOrderId() != null) {
BigDecimal subPrice = position.getSellOrderPrice().subtract(position.getBuyOrderPrice());
- profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue())).multiply(new BigDecimal(position.getOrderLever())).setScale(2,4);
+// profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue())).multiply(new BigDecimal(position.getOrderLever())).setScale(2,4);
+ profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue())).setScale(2,4);
if ("买跌".equals(position.getOrderDirection())) {
profitAndLose = profitAndLose.negate();
}
@@ -1658,9 +1880,15 @@
}
// stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
nowPrice = stockListVO.getNowPrice();
- if (nowPrice == null) {
- nowPrice = String.valueOf(0);
+ if (nowPrice == null || new BigDecimal(stockListVO.getNowPrice()).compareTo(BigDecimal.ZERO) <= 0) {
+ if(null != position.getBuyOrderIdIndex() && position.getBuyOrderIdIndex().compareTo(BigDecimal.ZERO) > 0){
+ nowPrice = String.valueOf(position.getBuyOrderIdIndex());
+ }else {
+ nowPrice = String.valueOf(position.getBuyOrderPrice());
+ }
}
+
+ orderTotalPrice = new BigDecimal(nowPrice).multiply(new BigDecimal(position.getOrderNum()));
BigDecimal subPrice = (new BigDecimal(nowPrice)).subtract(position.getBuyOrderPrice());
// profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue())).multiply(new BigDecimal(position.getOrderLever())).setScale(2,4);
@@ -1668,13 +1896,17 @@
if ("买跌".equals(position.getOrderDirection())) {
profitAndLose = profitAndLose.negate();
}
-
//总盈亏= 浮动盈亏 – 手续费 – 印花税 – 留仓费 – 点差费
allProfitAndLose = profitAndLose.subtract(position.getOrderFee()).subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
+ //改成盈亏百分比
+ BigDecimal allProfitAndLoseStrTemp = new BigDecimal(nowPrice).subtract(position.getBuyOrderPrice()).divide(position.getBuyOrderPrice(), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2,4);
+ allProfitAndLoseStr = allProfitAndLoseStrTemp.toString() + "%";
}
PositionProfitVO positionProfitVO = new PositionProfitVO();
positionProfitVO.setProfitAndLose(profitAndLose);
+ positionProfitVO.setOrderTotalPrice(orderTotalPrice);
positionProfitVO.setAllProfitAndLose(allProfitAndLose);
+ positionProfitVO.setAllProfitAndLoseStr(allProfitAndLoseStr);
positionProfitVO.setNowPrice(nowPrice);
return positionProfitVO;
@@ -2491,6 +2723,34 @@
return ServerResponse.createBySuccess("下單成功");
}
+
+ @Override
+ public void synchronizePrice(){
+ Map<String,BigDecimal> priceMap = new HashMap<>();
+ List<UserPosition> userPositions = this.userPositionMapper.synchronizePrice();
+ log.info("-------------------同步收盘价，查询数据总量 {}个--------------",userPositions.size());
+ int count = 0;
+ for (UserPosition position : userPositions) {
+ if(priceMap.containsKey(position.getStockGid())){
+ BigDecimal newPrice = priceMap.get(position.getStockGid());
+ position.setBuyOrderIdIndex(newPrice);
+ userPositionMapper.updateByPrimaryKey(position);
+ }else {
+ StockListVO stockListVO = new StockListVO();
+ stockListVO = SinaStockApi.assembleLideStockListVO(LiDeDataUtils.getStock(position.getStockCode()));
+ if (ObjectUtils.isEmpty(stockListVO)) {
+ stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
+ }
+ if(stockListVO.getNowPrice() != null && new BigDecimal(stockListVO.getNowPrice()).compareTo(BigDecimal.ZERO) > 0){
+ position.setBuyOrderIdIndex(new BigDecimal(stockListVO.getNowPrice()));
+ priceMap.put(position.getStockGid(),new BigDecimal(stockListVO.getNowPrice()));
+ userPositionMapper.updateByPrimaryKey(position);
+ }
+ }
+ count++;
+ }
+ log.info("-------------------同步收盘价 {}个--------------",count);
+ }
}
--
Gitblit v1.9.3