From 0071b2c24258a288eb1740d9859d677bdd988908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 16 Oct 2024 18:05:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=95=86?=
 =?UTF-8?q?=E6=88=B7ID=202.debug=EF=BC=9A=E6=99=BA=E8=83=BD=E7=94=B5?=
 =?UTF-8?q?=E9=87=8F=E5=A5=97=E9=A4=90=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/ss/device/domain/Device.java      | 1 +
 .../service/impl/TransactionBillServiceImpl.java              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
index f7a2bba4..ee0a776b 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
@@ -170,6 +170,7 @@ public class Device extends BaseEntity
     private BigDecimal remainTime;
 
     @ApiModelProperty("所属用户ID")
+    @JsonView(DeviceView.SuitList.class)
     private Long userId;
 
     @Excel(name = "起步时长")
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
index 3b4d14f7..2010fbc6 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
@@ -1406,10 +1406,10 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
     private BigDecimal calcSmartCountAmount(TransactionBillVO order, BigDecimal totalEle) {
         BigDecimal startEle = order.getSuitStartEle();
         BigDecimal usedEle = totalEle.subtract(startEle);   // 已使用的电量
-        BigDecimal suitTotalEle = transactionBillConverter.toRechargeEle(order);   // 套餐总电量
+        BigDecimal suitEle = new BigDecimal(order.getSuitTime());   // 套餐每周期的电量
 
         // 计算总使用的周期数，不满足一个周期也算一个周期
-        BigDecimal totalRound = usedEle.divide(suitTotalEle, 0, RoundingMode.UP);
+        BigDecimal totalRound = usedEle.divide(suitEle, 0, RoundingMode.UP);
         if (totalRound.compareTo(BigDecimal.ZERO) <= 0 ) {
             totalRound = BigDecimal.ONE;
         }