设备管理费pc接口

device-api-service/src/main/java/com/xy/entity/DeviceCharging.java

@@ -42,6 +42,12 @@ public class DeviceCharging implements Serializable {
     @ApiModelProperty(value = "最后续费时间")
     private LocalDateTime lastChargingTime;
 
+    @ApiModelProperty(value = "最后续费金额")
+    private Integer lastChargingMoney;
+
+    @ApiModelProperty(value = "最后续费方式")
+    private Integer lastChargingPayType;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

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

@@ -201,6 +201,8 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
         JList<DeviceChargingHistory> updateDeviceChargingHistory = new JArrayList<>();
         for (DeviceChargingHistory deviceChargingHistory : deviceChargingHistories) {
             DeviceCharging deviceCharging = deviceChargingsJMaps.get(deviceChargingHistory.getDeviceId())
+                    .setLastChargingPayType(deviceChargingHistory.getChargingType())
+                    .setLastChargingMoney(deviceChargingHistory.getChargingMoney())
                     .setLastChargingTime(now);
             Integer chargingSize = deviceChargingHistory.getChargingSize();
             boolean fal = false;

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

@@ -219,6 +219,12 @@ public class DeviceChargingDto {
         @ApiModelProperty(value = "最后续费时间")
         private LocalDateTime lastChargingTime;
 
+        @ApiModelProperty(value = "最后续费金额")
+        private Integer lastChargingMoney;
+
+        @ApiModelProperty(value = "最后续费方式")
+        private Integer lastChargingPayType;
+
         @ApiModelProperty(value = "过期状态说明")
         private String timeoutStatus;
     }