From 27310910e4c545b7acfffbca9e2e85c566561fe8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 30 Apr 2025 18:05:15 +0800
Subject: [PATCH] 1
---
src/main/resources/application.properties | 2 +-
src/main/java/com/nq/controller/UserApiController.java | 3 +--
src/main/java/com/nq/service/impl/StockDzServiceImpl.java | 12 +++++++++++-
src/main/java/com/nq/pojo/StockDz.java | 9 +++++++++
src/main/java/com/nq/service/IUserService.java | 2 +-
src/main/java/com/nq/service/impl/UserServiceImpl.java | 13 ++-----------
6 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index 4063c30..58a3a24 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -81,10 +81,9 @@
@ResponseBody
public ServerResponse reg(@RequestParam("agentCode") String agentCode,
@RequestParam("phone") String phone,
- @RequestParam(value = "yzmCode", defaultValue = "") String yzmCode,
@RequestParam("userPwd") String userPwd,
HttpServletRequest httpServletRequest) {
- return this.iUserService.reg(yzmCode, agentCode, phone, userPwd, httpServletRequest);
+ return this.iUserService.reg( agentCode, phone, userPwd, httpServletRequest);
}
//登录
diff --git a/src/main/java/com/nq/pojo/StockDz.java b/src/main/java/com/nq/pojo/StockDz.java
index c0c780a..49e519a 100644
--- a/src/main/java/com/nq/pojo/StockDz.java
+++ b/src/main/java/com/nq/pojo/StockDz.java
@@ -4,6 +4,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.beans.Transient;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -54,4 +55,12 @@
private static final long serialVersionUID = 1L;
//价格
private BigDecimal nowPrice;
+
+ // 差价
+ @TableField(exist = false)
+ private BigDecimal priceSpread;
+ // 百分比
+ @TableField(exist = false)
+ private BigDecimal priceSpreadPercentum;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/nq/service/IUserService.java b/src/main/java/com/nq/service/IUserService.java
index 4bf0543..afb582c 100644
--- a/src/main/java/com/nq/service/IUserService.java
+++ b/src/main/java/com/nq/service/IUserService.java
@@ -10,7 +10,7 @@
import javax.servlet.http.HttpServletRequest;
public interface IUserService {
- ServerResponse reg(String paramString1, String paramString2, String paramString3, String paramString4, HttpServletRequest paramHttpServletRequest);
+ ServerResponse reg(String paramString2, String paramString3, String paramString4, HttpServletRequest paramHttpServletRequest);
ServerResponse login(String paramString1, String paramString2, HttpServletRequest paramHttpServletRequest);
diff --git a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
index 3c8ce9d..60a8bd8 100644
--- a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
@@ -16,6 +16,7 @@
import com.nq.pojo.StockDz;
import com.nq.pojo.UserPosition;
import com.nq.pojo.reponse.RPageInfo;
+import com.nq.service.IPriceServices;
import com.nq.service.StockDzService;
import com.nq.utils.stock.sina.StockApi;
import com.nq.utils.timeutil.DateTimeUtil;
@@ -28,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -51,12 +53,20 @@
private StockMapper stockMapper;
@Autowired
private UserPositionMapper userPositionMapper;
-
+ @Autowired
+ IPriceServices iPriceServices;
@Override
public ServerResponse getDzList(int pageNum, int pageSize, String orderBy, String keyWords, HttpServletRequest request) {
PageHelper.startPage(pageNum, pageSize);
String formatDate = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
List<StockDz> stockTypeDz = stockMapper.findStockTypeDz(orderBy, keyWords,formatDate);
+ stockTypeDz.forEach(f->{
+ String price = iPriceServices.getNowPrice(f.getStockCode()).toString();
+ BigDecimal subtract = f.getNowPrice().subtract(new BigDecimal(price));
+ f.setPriceSpread(subtract);
+ f.setPriceSpreadPercentum(
+ subtract.divide(new BigDecimal(price), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))
+ ); });
RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockTypeDz);
return ServerResponse.createBySuccess(pageInfo);
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index aa33b1d..9b5e1b2 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -141,20 +141,11 @@
IUserService iUserService;
- public ServerResponse reg(String yzmCode, String agentCode, String phone, String userPwd,HttpServletRequest request) {
+ public ServerResponse reg( String agentCode, String phone, String userPwd,HttpServletRequest request) {
if (StringUtils.isBlank(agentCode) || StringUtils.isBlank(phone) ||
- StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode)) {
+ StringUtils.isBlank(userPwd)) {
return ServerResponse.createByErrorMsg("注册失败。该参数不能为空",request);
}
-
-
-// String redis_yzm = RedisShardedPoolUtils.get(phone);
-//
-// log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
-// if (!yzmCode.equals(redis_yzm)) {
-// return ServerResponse.createByErrorMsg("由于验证码不正确，注册失败。", request);
-// }
-
AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
if (agentUser == null) {
return ServerResponse.createByErrorMsg("由于代理不存在，注册失败",request);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 28daf15..201096e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -62,7 +62,7 @@
ST_HTTP_API = http://api-sa.js-stock.top/
ST_WS_URL = ws://api-sa-ws.js-stock.top
-ST_KEY = chetm43ZxsgzEzqr3dZ0
+ST_KEY = mmiivLFJ07bXFDKAb9mH
#HK_HTTP_API = http://api-v1.js-stock.top/
--
Gitblit v1.9.3