Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -159,6 +160,19 @@ public class BTodayStockController {
|
||||
|
||||
String forObject = restTemplate.getForObject(apiUrl, String.class);
|
||||
JSONObject jsonObject = JSON.parseObject(forObject);
|
||||
JSONArray arryData = jsonObject.getJSONArray("data");
|
||||
if (arryData != null&&arryData.size()>0) {
|
||||
try {
|
||||
JSONObject jsonObject1 = arryData.getJSONObject(0);
|
||||
String price = jsonObject1.getString("price");
|
||||
double priceValue = Double.parseDouble(price);
|
||||
DecimalFormat df = new DecimalFormat("0.00");
|
||||
jsonObject1.put("price", df.format(priceValue));
|
||||
} catch (NumberFormatException e) {
|
||||
// Handle the case where price is not a valid double
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
jsonObject.put("id",btodayStock.getId());
|
||||
return jsonObject;
|
||||
}
|
||||
|
||||
@@ -191,7 +191,7 @@ public class MoneyApiController {
|
||||
if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null ) {
|
||||
JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data");
|
||||
if(data!=null){
|
||||
json1.put("company",data.getString("company"));
|
||||
json1.put("company",data.getString("SC_FULLNM"));
|
||||
json1.put("pricepercentchange",data.getString("pricepercentchange"));
|
||||
json1.put("stockType",stockType);
|
||||
json1.put("pricechange",data.getString("pricechange"));
|
||||
|
||||
Reference in New Issue
Block a user