From e9dcc1d3da82d6de18a81279c3f87773de7b4cfa Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 九月 2024 14:55:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 2 +-
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
index 093abfc..dcab664 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
@@ -60,7 +60,12 @@
@ApiModelProperty(value = "上架状态（0=否，1=是）")
@TableField("status")
private Integer status;
-
+ @ApiModelProperty(value = "小程序id")
+ @TableField("applet_id")
+ private String appletId;
+ @ApiModelProperty(value = "小程序名称")
+ @TableField("applet_name")
+ private String appletName;
@ApiModelProperty(value = "活动状态 1未开始 2已开始 3已结束")
@TableField(exist = false)
private Integer startState;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 50d9583..85e408c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1907,7 +1907,7 @@
tSettlementConfirm.setVenue(dto.getVenue());
tSettlementConfirm.setMetering(dto.getMetering());
tSettlementConfirm.setClean(dto.getClean());
- tSettlementConfirm.setLossElectronic(dto.getLossElectronic());
+ tSettlementConfirm.setLossElectronic(dto.getMeteringElectronic().subtract(dto.getChargingElectronic()));
tSettlementConfirm.setMaintain(dto.getMaintain());
tSettlementConfirm.setMeteringElectronic(dto.getMeteringElectronic());
--
Gitblit v1.7.1