@@ -60,5 +60,6 @@ public class DeviceAlgorithmChargingHistory implements Serializable {
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
-
+ @ApiModelProperty(value = "备注")
+ private String node;
}
@@ -53,4 +53,6 @@ public class DeviceChargingHistory extends BaseEntity<DeviceChargingHistory> imp
@@ -103,7 +103,8 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
.setName(deviceAlgorithmCharging.getName())
.setChargingType(pay.getPayType())
.setCreateTime(now)
- .setUpdateTime(now);
+ .setUpdateTime(now)
+ .setNode(pay.getNode());
deviceAlgorithmChargingHistories.add(deviceAlgorithmChargingHistory);
});
//添加设备算法计费历史表
@@ -185,7 +185,8 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
.setChargingType(payType)
.setStandard(deviceCharging.getStandard())
deviceChargingHistories.add(deviceChargingHistory);
if (!Emptys.check(deviceChargingHistories)) {
@@ -56,6 +56,9 @@ public class DeviceAlgorithmChargingDto {
@ApiModelProperty("计费信息")
private List<DeviceAlgorithmCharging> deviceAlgorithmChargings;
+
@Data
@Accessors(chain = true)
public static class DeviceAlgorithmCharging {
@@ -67,7 +67,8 @@ public class DeviceAlgorithmChargingHistoryDto {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -79,6 +79,9 @@ public class DeviceChargingDto {
@ApiModelProperty(value = "支付类型 2=支付宝 3=微信 100=赠送")
private Integer payType;
public static class DeviceCharging {
@@ -54,6 +54,8 @@ public class DeviceChargingHistoryDto {