#MOD 设备详情图表数据金额类数据转换到元

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -760,40 +760,44 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         //每天的数据
         Map<Integer, DeviceDataDto.Vo> dataDayMap = listByDay.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDateValue, i -> i));
 
-        List<DeviceInfoDto.MyChartSeries> series = new ArrayList<>();
+        List<DeviceInfoDto.MyChartSeries3> series = new ArrayList<>();
 
         String[] names = {"销售额", "订单数", "退款金额", "退款数"};
         for (int i = 0; i < names.length; i++) {
-            DeviceInfoDto.MyChartSeries myChartSeries = new DeviceInfoDto.MyChartSeries();
+            DeviceInfoDto.MyChartSeries3 myChartSeries = new DeviceInfoDto.MyChartSeries3();
             //某个类型每天的数据
-            List<Integer> data = new ArrayList<>();
+            List<String> data = new ArrayList<>();
             if (i == 0) {
                 //销售额
                 dateList.forEach(d -> {
                     //每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
-                    data.add(deviceData == null ? 0 : deviceData.getSalesMoney());
+                    Integer salesMoney = deviceData.getSalesMoney() == null ? 0 : deviceData.getSalesMoney();
+                    BigDecimal day = BigDecimal.valueOf(salesMoney).divide(BigDecimal.valueOf(100));
+                    data.add(String.valueOf(day));
                 });
             } else if (i == 1) {
                 //订单数
                 dateList.forEach(d -> {
                     //每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
-                    data.add(deviceData == null ? 0 : deviceData.getSalesCount());
+                    data.add(deviceData == null ? "0" : String.valueOf(deviceData.getSalesCount()));
                 });
             } else if (i == 2) {
                 //退款金额
                 dateList.forEach(d -> {
                     //每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
-                    data.add(deviceData == null ? 0 : deviceData.getRefundMoney());
+                    Integer refundMoney = deviceData.getRefundMoney() == null ? 0 : deviceData.getRefundMoney();
+                    BigDecimal day = BigDecimal.valueOf(refundMoney).divide(BigDecimal.valueOf(100));
+                    data.add(String.valueOf(day));
                 });
             } else if (i == 3) {
                 //退款数
                 dateList.forEach(d -> {
                     //每日数据填充
                     DeviceDataDto.Vo deviceData = dataDayMap.get(d);
-                    data.add(deviceData == null ? 0 : deviceData.getRefundCount());
+                    data.add(deviceData == null ? "0" : String.valueOf(deviceData.getRefundCount()));
                 });
             }
             myChartSeries.setName(names[i]);

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -718,7 +718,7 @@ public class DeviceInfoDto {
         private List<String> categories;
 
         @ApiModelProperty("名称、数据")
-        private List<MyChartSeries> series;
+        private List<MyChartSeries3> series;
 
     }
 
@@ -744,6 +744,17 @@ public class DeviceInfoDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class MyChartSeries3 {
+        @ApiModelProperty("数据")
+        private List<String> data;
+
+        @ApiModelProperty("名称")
+        private String name;
+
+    }
+
 
     @Data
     @Accessors(chain = true)
@@ -799,7 +810,7 @@ public class DeviceInfoDto {
 
     @Data
     @Accessors(chain = true)
-    public static class DeviceIdDto{
+    public static class DeviceIdDto {
         @NotNull(message = "设备id不能为空")
         @ApiModelProperty("设备id")
         private List<Long> deviceId;