From 3a7c23aa157521fb61130f34d6390e4332c78344 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Sat, 28 Sep 2024 11:24:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/EtOrder.java |  1 -
 .../service/impl/CallbackServiceImpl.java     |  1 +
 .../resources/mapper/system/EtOrderMapper.xml | 22 ++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java
index 3f3efb5..74c6d7f 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java
@@ -339,7 +339,6 @@ public class EtOrder extends BaseEntity
 
     /** 成本 */
     @Excel(name = "成本")
-    @TableField(exist = false)
     private BigDecimal cost;
 
     /** 可退预约费 */
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
index a2e55a4..5409616 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
@@ -318,6 +318,7 @@ public class CallbackServiceImpl implements CallbackService {
         BigDecimal bigDecimal = costRate.divide(new BigDecimal(100), 6, BigDecimal.ROUND_HALF_UP);
         BigDecimal cost = bigDecimal.multiply(payFee).setScale(2, BigDecimal.ROUND_HALF_UP);
         logger.info("【保存资金流水记录--订单支付】 成本==============bigDecimal=====================："+bigDecimal);
+        logger.info("【保存资金流水记录--订单支付】 成本==============cost=====================："+cost);
         return cost;
     }
 
diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
index 5be6cd6..3a59e47 100644
--- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="platformServiceFee"    column="platform_service_fee"    />
         <result property="operatorDividend"    column="operator_dividend"    />
         <result property="payChannel"    column="pay_channel"    />
+        <result property="cost"    column="cost"    />
     </resultMap>
 
     <sql id="selectEtOrderVo">
@@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time,
                rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,
                upload_time,deduction_amount,audio_files,used_sn,change_reason,locking,auto_refund_deposit,free_ride_time,
-               rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,
+               rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,cost,
                operator_dividend from et_order
     </sql>
 
@@ -81,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time,
                rule_end_time, return_type, cycle,deposit_deduction,video_url,upload_time,deduction_amount,audio_files,
                used_sn,change_reason,locking,auto_refund_deposit,free_ride_time,
-               rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,
+               rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,cost,
                operator_dividend from et_order
     </sql>
 
@@ -107,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.paid,
         o.pay_type,
         o.deposit_deduction,
+        o.riding_rule_json,
         o.type,
         COALESCE(o.total_fee, 0) AS total_fee,
         COALESCE(o.pay_fee, 0) AS pay_fee,
@@ -138,7 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.handling_charge,
         o.platform_service_fee,
         o.operator_dividend,
-        o.pay_channel
+        o.pay_channel,
+        o.cost
         FROM
         et_order o
         LEFT JOIN
@@ -238,7 +241,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             o.handling_charge,
             o.platform_service_fee,
             o.operator_dividend,
-            o.pay_channel
+            o.pay_channel,
+            o.cost
         FROM
         et_order o
         LEFT JOIN
@@ -337,7 +341,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.handling_charge,
         o.platform_service_fee,
         o.operator_dividend,
-        o.pay_channel
+        o.pay_channel,
+        o.cost
         FROM
         et_order o
         LEFT JOIN
@@ -407,7 +412,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                o.capped_amount,
                o.handling_charge,
                o.platform_service_fee,
-               o.operator_dividend
+               o.operator_dividend,
+               o.cost
         from et_order o
         LEFT JOIN et_user u ON u.user_id = o.user_id
         LEFT JOIN et_operating_area oa ON o.area_id = oa.area_id
@@ -959,6 +965,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chargingCycleValue != null">charging_cycle_value,</if>
             <if test="cappedAmount != null">capped_amount,</if>
             <if test="payChannel != null and payChannel != ''">pay_channel,</if>
+            <if test="cost != null">cost,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -1004,6 +1011,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chargingCycleValue != null">#{chargingCycleValue},</if>
             <if test="cappedAmount != null">#{cappedAmount},</if>
             <if test="payChannel != null and payChannel != ''">#{payChannel},</if>
+            <if test="cost != null">#{cost},</if>
          </trim>
     </insert>
 
@@ -1062,6 +1070,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformServiceFee != null">platform_service_fee = #{platformServiceFee},</if>
             <if test="operatorDividend != null">operator_dividend = #{operatorDividend},</if>
             <if test="payChannel != null">pay_channel = #{payChannel},</if>
+            <if test="cost != null">cost = #{cost},</if>
         </trim>
         where order_id = #{orderId}
     </update>
@@ -1121,6 +1130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformServiceFee != null">platform_service_fee = #{platformServiceFee},</if>
             <if test="operatorDividend != null">operator_dividend = #{operatorDividend},</if>
             <if test="payChannel != null">pay_channel = #{payChannel},</if>
+            <if test="cost != null">cost = #{cost},</if>
         </trim>
         where order_no = #{orderNo}
     </update>