From 57c2b6875b5f026a1432f3209471d6b4503f43fc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 29 Oct 2024 13:35:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/PriceServicesImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PriceServicesImpl.java b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
index 5226333..4a64986 100644
--- a/src/main/java/com/nq/service/impl/PriceServicesImpl.java
+++ b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
@@ -57,19 +57,27 @@
if (stockSetting.getType().equals("0")) {
return new BigDecimal(stockSetting.getPrice());
} else {
- String s = doPost(stock.getStockCode());
+ String s = doPost(stock.getStockCode(),stock.getStockType());
if (null != s) {
Map<String, Object> stringObjectMap = jsonToMap(s);
- return new BigDecimal(stringObjectMap.get("last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
+ if(stock.getStockType().equals("US")){
+ return new BigDecimal(stringObjectMap.get("Last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
+ }else{
+ return new BigDecimal(stringObjectMap.get("last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
+ }
}
}
}
}
- String s = doPost(stock.getStockCode());
+ String s = doPost(stock.getStockCode(),stock.getStockType());
if (null != s) {
Map<String, Object> stringObjectMap = jsonToMap(s);
- return new BigDecimal(stringObjectMap.get("last").toString());
+ if(stock.getStockType().equals("US")){
+ return new BigDecimal(stringObjectMap.get("Last").toString());
+ }else{
+ return new BigDecimal(stringObjectMap.get("last").toString());
+ }
}
return BigDecimal.ZERO;
}
@@ -77,7 +85,7 @@
@Override
public Map<String, Object> getNewStock(String stockCode) {
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", stockCode));
- String s = doPost(stock.getStockCode());
+ String s = doPost(stock.getStockCode(),stock.getStockType());
if (null != s) {
Map<String, Object> stringObjectMap = jsonToMap(s);
return stringObjectMap;
@@ -99,10 +107,14 @@
}
}
- public String doPost(String pid) {
-
+ public String doPost(String pid,String stockType) {
+ String url;
+ if(stockType.equals("JP")){
+ url = PropertiesUtil.getProperty("JP_HTTP_API") + "stock?version=v1&key=" + PropertiesUtil.getProperty("JP_KEY");
+ }else{
+ url = PropertiesUtil.getProperty("US_HTTP_API") + "stock?version=v1&key=" + PropertiesUtil.getProperty("US_KEY");
+ }
try {
- String url = PropertiesUtil.getProperty("JP_HTTP_API") + "stock?version=v1&key=" + PropertiesUtil.getProperty("JP_KEY");
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
--
Gitblit v1.9.3