From 9e08d916f75050b2a732e787599c52bee47ff3a1 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 13 Oct 2025 16:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/pile/domain/OrderDetail.java | 10 ++++++++++
 .../resources/mapper/pile/OrderBasicInfoMapper.xml     |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java
index c44079dc1..512131153 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java
@@ -25,6 +25,16 @@ public class OrderDetail {
      */
     private String orderCode;
 
+    /**
+     * 电表开始值
+     */
+    private String ammeterTotalStart;
+
+    /**
+     * 电表结束值
+     */
+    private String ammeterTotalEnd;
+
     /**
      * 总用电量
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index da2cf02c6..b1216fabf 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -1808,10 +1808,14 @@
     <resultMap id="OrderDetailResult" type="com.jsowell.pile.domain.OrderDetail">
         <result column="id" property="id"/>
         <result column="order_code" property="orderCode"/>
+        <result column="ammeter_total_start" property="ammeterTotalStart"/>
+        <result column="ammeter_total_end" property="ammeterTotalEnd"/>
         <result column="total_used_electricity" property="totalUsedElectricity"/>
         <result column="total_order_amount" property="totalOrderAmount"/>
         <result column="total_electricity_amount" property="totalElectricityAmount"/>
+        <result column="discount_electricity_amount" property="discountElectricityAmount"/>
         <result column="total_service_amount" property="totalServiceAmount"/>
+        <result column="discount_service_amount" property="discountServiceAmount"/>
         <result column="sharp_price" property="sharpPrice"/>
         <result column="sharp_used_electricity" property="sharpUsedElectricity"/>
         <result column="sharp_electricity_price" property="sharpElectricityPrice"/>
@@ -1848,10 +1852,14 @@
     <sql id="Detail_Base_Column_List">
         id,
         order_code,
+        ammeter_total_start,
+        ammeter_total_end,
         total_used_electricity,
         total_order_amount,
         total_electricity_amount,
+        discount_electricity_amount,
         total_service_amount,
+        discount_service_amount,
         sharp_price,
         sharp_used_electricity,
         sharp_electricity_price,