平均价格

ch-core/src/main/java/com/wwdz/ch/core/entity/Chart.java

@@ -9,5 +9,5 @@ public class Chart implements Entity {
 
     private List<String> xData;
 
-    private List<Object> values;
+    private List<Double> values;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/QueryPriceServiceImpl.java

@@ -69,7 +69,7 @@ public class QueryPriceServiceImpl implements QueryPriceService {
             dto.setEndBidTime(nowMills);
             List<BidRecord> bidRecordList = bidRecordDao.queryByCid(dto);
             List<String> xData = new ArrayList<>();
-            List<Object> valueList = new ArrayList<>();
+            List<Double> valueList = new ArrayList<>();
             double totalPrice = 0;
             Map<String, Object> map = new HashMap<>();
             map.put("details", CategoryVo.of(category));
@@ -81,12 +81,21 @@ public class QueryPriceServiceImpl implements QueryPriceService {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 String time = date.format(formatter);
                 xData.add(time);
-                totalPrice += (bidRecord.getPrice() / (double)100);
+            //    totalPrice += (bidRecord.getPrice() / (double)100);
                 valueList.add(bidRecord.getPrice() / (double)100 / (double)10000);
             }
             double averagePrice = 0;
+            int maxTimeNum = 0;
             if (!CollectionUtils.isEmpty(bidRecordList)) {
-                averagePrice = totalPrice / bidRecordList.size();
+                String maxTime = xData.get(xData.size() -1);
+                for (int i =0; i<xData.size(); i++) {
+                    if (xData.get(i).equals(maxTime)) {
+                        maxTimeNum = maxTimeNum + 1;
+                        totalPrice += valueList.get(i);
+                    }
+                }
+                averagePrice = totalPrice / maxTimeNum;
+                map.put("averagePrice", StringUtil.formatAmount(String.valueOf(Math.round(averagePrice * 10000))));
                 Instant instant = Instant.ofEpochSecond(bidRecordList.get(bidRecordList.size() - 1).getBidTime());
                 LocalDateTime date = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
@@ -96,7 +105,7 @@ public class QueryPriceServiceImpl implements QueryPriceService {
             chart.setXData(xData);
             chart.setValues(valueList);
             map.put("chart", chart);
-            map.put("averagePrice", StringUtil.formatAmount(String.valueOf(Math.round(averagePrice))));
+
             return Result.success(map);
         } catch (Exception e) {
             logger.error("查询类目价格详情失败:{}", e);