From dc2713378450728f5c157add5a659c16bce71ace Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Mon, 01 Dec 2025 12:53:10 +0800
Subject: [PATCH] 部分平仓+跌涨幅-100%问题处理
---
src/main/java/com/nq/dao/AgentUserMapper.java | 2
src/main/resources/mapper/UserPositionMapper.xml | 8 +
src/main/java/com/nq/controller/protol/UserController.java | 12 ++
src/main/java/com/nq/dao/UserPositionMapper.java | 2
src/main/java/com/nq/service/IAgentUserService.java | 2
src/main/java/com/nq/utils/task/stock/StockTask.java | 9 +
src/main/java/com/nq/pojo/UserPosition.java | 10 +
src/main/java/com/nq/service/impl/AgentUserServiceImpl.java | 9 +
src/main/resources/mapper/AgentUserMapper.xml | 7 +
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 252 +++++++++++++++++++++++++++++++++++++++++
src/main/java/com/nq/service/IUserPositionService.java | 3
src/main/java/com/nq/service/impl/UserServiceImpl.java | 17 ++
12 files changed, 327 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 1d2745a..a9a99aa 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -129,6 +129,18 @@
}
return serverResponse;
}
+ //用户部分平仓操作
+ @RequestMapping({"sellbf.do"})
+ @ResponseBody
+ public ServerResponse sellbf(HttpServletRequest request, @RequestParam("positionSn") String positionSn,Integer quantity) {
+ ServerResponse serverResponse = null;
+ try {
+ serverResponse = this.iUserPositionService.sellbf(positionSn, quantity);
+ } catch (Exception e) {
+ log.error("用户平仓操作 = {}", e);
+ }
+ return serverResponse;
+ }
//挂单操作-添加
@RequestMapping({"addOrder.do"})
@ResponseBody
diff --git a/src/main/java/com/nq/dao/AgentUserMapper.java b/src/main/java/com/nq/dao/AgentUserMapper.java
index 312d429..8b94e23 100644
--- a/src/main/java/com/nq/dao/AgentUserMapper.java
+++ b/src/main/java/com/nq/dao/AgentUserMapper.java
@@ -21,6 +21,8 @@
int updateTotalMoney(AgentUser paramAgentUser);
+ int updateAgentCode(AgentUser paramAgentUser);
+
AgentUser findByCode(String paramString);
AgentUser findByPhone(String paramString);
diff --git a/src/main/java/com/nq/dao/UserPositionMapper.java b/src/main/java/com/nq/dao/UserPositionMapper.java
index 71a7b93..ca19bed 100644
--- a/src/main/java/com/nq/dao/UserPositionMapper.java
+++ b/src/main/java/com/nq/dao/UserPositionMapper.java
@@ -49,4 +49,6 @@
UserPosition findUserPositionByCode(@Param("userId") Integer paramInteger,@Param("stockCode") String stockCode);
+ List<UserPosition> synchronizePrice();
+
}
diff --git a/src/main/java/com/nq/pojo/UserPosition.java b/src/main/java/com/nq/pojo/UserPosition.java
index 2d14067..5ba480e 100644
--- a/src/main/java/com/nq/pojo/UserPosition.java
+++ b/src/main/java/com/nq/pojo/UserPosition.java
@@ -52,6 +52,8 @@
/*追加保证金额*/
private BigDecimal marginAdd;
+ private BigDecimal buyOrderIdIndex;
+
public void setPositionType(Integer positionType) {
this.positionType = positionType;
}
@@ -518,5 +520,13 @@
public void setMarginAdd(BigDecimal marginAdd) {
this.marginAdd = marginAdd;
}
+
+ public BigDecimal getBuyOrderIdIndex() {
+ return buyOrderIdIndex;
+ }
+
+ public void setBuyOrderIdIndex(BigDecimal buyOrderIdIndex) {
+ this.buyOrderIdIndex = buyOrderIdIndex;
+ }
}
diff --git a/src/main/java/com/nq/service/IAgentUserService.java b/src/main/java/com/nq/service/IAgentUserService.java
index 9cf0400..9265317 100644
--- a/src/main/java/com/nq/service/IAgentUserService.java
+++ b/src/main/java/com/nq/service/IAgentUserService.java
@@ -28,6 +28,8 @@
ServerResponse update(AgentUser paramAgentUser);
+ ServerResponse updateAgentCode(AgentUser paramAgentUser);
+
int CountAgentNum();
List<AgentUser> getAgentSuperiorList(int agentId);
diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index d41b465..3bb22b7 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -11,9 +11,12 @@
import javax.servlet.http.HttpServletRequest;
public interface IUserPositionService {
+ void synchronizePrice();
ServerResponse buy(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, Integer paramInteger4,BigDecimal paramInteger5,BigDecimal paramInteger6, HttpServletRequest paramHttpServletRequest) throws Exception;
ServerResponse sell(String paramString, int paramInt) throws Exception;
+
+ ServerResponse sellbf(String paramString, Integer quantity) throws Exception;
ServerResponse lock(Integer paramInteger1, Integer paramInteger2, String paramString);
diff --git a/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java b/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
index 7499264..8be4ce5 100644
--- a/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
@@ -372,6 +372,15 @@
return ServerResponse.createByErrorMsg("修改代理失败");
}
+ @Override
+ public ServerResponse updateAgentCode(AgentUser paramAgentUser) {
+ int updateCount = agentUserMapper.updateAgentCode(paramAgentUser);
+ if (updateCount > 0) {
+ return ServerResponse.createBySuccessMsg("修改代理成功");
+ }
+ return ServerResponse.createByErrorMsg("修改代理失败");
+ }
+
public int CountAgentNum() {
return this.agentUserMapper.CountAgentNum();
}
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index c6f7764..fc23fee 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;
@@ -184,9 +185,9 @@
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 (!am_flag && !pm_flag) {
+// return ServerResponse.createByErrorMsg("下单失败，不在交易时段内");
+// }
if (siteProduct.getHolidayDisplay()) {
return ServerResponse.createByErrorMsg("周末或节假日不能交易！");
}
@@ -816,6 +817,215 @@
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 {
@@ -1013,9 +1223,12 @@
if (ObjectUtils.isEmpty(stockListVO)) {
stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
}
+
if (stockListVO.getNowPrice() == null) {
stockListVO.setNowPrice("0");
}
+
+
BigDecimal nowPrice = new BigDecimal(stockListVO.getNowPrice());
@@ -1665,7 +1878,12 @@
// stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
nowPrice = stockListVO.getNowPrice();
if (nowPrice == null) {
- nowPrice = String.valueOf(0);
+ if(position.getBuyOrderIdIndex().compareTo(BigDecimal.ZERO) > 0){
+ nowPrice = String.valueOf(position.getBuyOrderIdIndex());
+ }else {
+ nowPrice = String.valueOf(position.getBuyOrderPrice());
+ }
+
}
BigDecimal subPrice = (new BigDecimal(nowPrice)).subtract(position.getBuyOrderPrice());
@@ -1674,7 +1892,6 @@
if ("买跌".equals(position.getOrderDirection())) {
profitAndLose = profitAndLose.negate();
}
-
//总盈亏= 浮动盈亏 – 手续费 – 印花税 – 留仓费 – 点差费
allProfitAndLose = profitAndLose.subtract(position.getOrderFee()).subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
//改成盈亏百分比
@@ -2501,6 +2718,31 @@
return ServerResponse.createBySuccess("下單成功");
}
+
+ @Override
+ public void synchronizePrice(){
+ Map<String,BigDecimal> priceMap = new HashMap<>();
+ List<UserPosition> userPositions = this.userPositionMapper.synchronizePrice();
+ for (UserPosition position : userPositions) {
+ if(priceMap.containsKey(position.getStockGid())){
+ BigDecimal newPrice = priceMap.get(position.getStockGid());
+ position.setBuyOrderIdIndex(newPrice);
+ }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){
+ stockListVO.setNowPrice(String.valueOf(position.getBuyOrderPrice()));
+ }
+ position.setBuyOrderIdIndex(new BigDecimal(stockListVO.getNowPrice()));
+ priceMap.put(position.getStockGid(),new BigDecimal(stockListVO.getNowPrice()));
+ }
+ userPositionMapper.updateByPrimaryKey(position);
+ }
+ log.info("-------------------同步收盘价 {}个--------------");
+ }
}
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 9e2f001..f632221 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -11,6 +11,7 @@
import com.nq.pojo.*;
import com.nq.service.*;
import com.nq.utils.DateTimeUtil;
+import com.nq.utils.KeyUtils;
import com.nq.utils.PropertiesUtil;
import com.nq.utils.SymmetricCryptoUtil;
import com.nq.utils.ip.IpUtils;
@@ -178,12 +179,28 @@
int insertCount = this.userMapper.insert(user);
if (insertCount > 0) {
+ //用户注册成功重新代理机构码重新生成
+ String newAgentCode = generateUniqueAgentCode();
+ agentUser.setAgentCode(newAgentCode);
+ iAgentUserService.updateAgentCode(agentUser);
log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[] { phone, uip, uadd });
return ServerResponse.createBySuccessMsg("注册成功.请登录");
}
return ServerResponse.createBySuccessMsg("注册出错, 请重试");
}
+ public String generateUniqueAgentCode() {
+ // 生成新的 agent code
+ String newAgentCode = KeyUtils.getAgentUniqueKey();
+
+ // 如果找到重复的 agent code，则递归重新生成
+ if (iAgentUserService.findByCode(newAgentCode) != null) {
+ return generateUniqueAgentCode(); // 递归调用
+ }
+
+ // 返回唯一的 agent code
+ return newAgentCode;
+ }
public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
diff --git a/src/main/java/com/nq/utils/task/stock/StockTask.java b/src/main/java/com/nq/utils/task/stock/StockTask.java
index 1f6d364..84aa6cb 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -6,6 +6,7 @@
import com.nq.dao.StockMapper;
import com.nq.pojo.Stock;
import com.nq.service.IStockService;
+import com.nq.service.IUserPositionService;
import com.nq.utils.DateTimeUtil;
import com.nq.utils.HttpClientRequest;
import com.nq.utils.PropertiesUtil;
@@ -31,6 +32,8 @@
IStockService stockService;
@Autowired
StockMapper stockMapper;
+ @Autowired
+ IUserPositionService userPositionService;
private static final Logger log = LoggerFactory.getLogger(StockTask.class);
@@ -45,7 +48,11 @@
}
log.info("am = {} pm = {}", Boolean.valueOf(am), Boolean.valueOf(pm));
}
-
+ @Scheduled(cron = "0 0 18 * * ?")
+// @Scheduled(cron = "0 * * * * ?")
+ public void synchronizePrice(){
+ this.userPositionService.synchronizePrice();
+ }
// /*股票走勢圖定時任務-15*/
// @Scheduled(cron = "0 0/1 9-15 * * ?")
// public void z1() {
diff --git a/src/main/resources/mapper/AgentUserMapper.xml b/src/main/resources/mapper/AgentUserMapper.xml
index 495130c..a24fda6 100644
--- a/src/main/resources/mapper/AgentUserMapper.xml
+++ b/src/main/resources/mapper/AgentUserMapper.xml
@@ -180,6 +180,13 @@
where id = #{id,jdbcType=INTEGER}
</update>
+ <update id="updateAgentCode" parameterType="com.nq.pojo.AgentUser" >
+ update agent_user
+ set
+ agent_code = #{agentCode,jdbcType=VARCHAR}
+ where id = #{id,jdbcType=INTEGER}
+ </update>
+
<select id="findByCode" resultMap="BaseResultMap" parameterType="string">
SELECT
<include refid="Base_Column_List"/>
diff --git a/src/main/resources/mapper/UserPositionMapper.xml b/src/main/resources/mapper/UserPositionMapper.xml
index ce25975..4053f52 100644
--- a/src/main/resources/mapper/UserPositionMapper.xml
+++ b/src/main/resources/mapper/UserPositionMapper.xml
@@ -422,6 +422,7 @@
is_lock = #{isLock,jdbcType=INTEGER},
lock_msg = #{lockMsg,jdbcType=VARCHAR},
stock_plate = #{stockPlate,jdbcType=VARCHAR},
+ buy_order_id_index = #{buyOrderIdIndex,jdbcType=DECIMAL},
spread_rate_price = #{spreadRatePrice,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER}
</update>
@@ -466,6 +467,13 @@
order by id desc
</select>
+ <select id="synchronizePrice" parameterType="integer" resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List"/>
+ FROM user_position
+ WHERE sell_order_id is null
+ </select>
+
<select id="listByAgent" parameterType="map" resultMap="BaseResultMap">
SELECT
--
Gitblit v1.9.3