From b013683cd567b8de3bf559fce947b9e3360185c8 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 25 Nov 2024 08:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/service/impl/CallbackServiceImpl.java  | 4 +++-
 .../com/ruoyi/system/service/impl/EtOrderServiceImpl.java   | 1 +
 .../src/main/resources/mapper/system/EtOrderMapper.xml      | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

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 55b500d..ef91717 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
@@ -663,7 +663,8 @@ public class CallbackServiceImpl implements CallbackService {
      * 资金流水记录
      * */
     @Override
-    public EtCapitalFlow capitalFlowRecords(EtOrder order,String type,String busType,String ownerType,SysUser user,String payType,BigDecimal totalPartnerDividend,BigDecimal refundPercentage) {
+    public EtCapitalFlow capitalFlowRecords(EtOrder order,String type,String busType,String ownerType,SysUser user,String payType,
+                                            BigDecimal totalPartnerDividend,BigDecimal refundPercentage) {
         EtCapitalFlow capitalFlow = new EtCapitalFlow();
         if(ownerType.equals(ServiceConstants.OWNER_TYPE_OPERATOR)){//运营商
             SysDept sysDept = wxPayService.getDeptObjByAreaId(order.getAreaId());
@@ -828,6 +829,7 @@ public class CallbackServiceImpl implements CallbackService {
         SysUser sysUser = new SysUser();
         sysUser.setUserType("03");
         sysUser.setAreaId(order.getAreaId());
+        sysUser.setStatus("0");
         List<SysUser> sysUsers = userMapper.selectUserList(sysUser);
         // 计算总的分成比例，过滤掉合作时间过期的用户
         double totalDividendProportion = sysUsers.stream()
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
index e0bb6bf..42413ac 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
@@ -639,6 +639,7 @@ public class EtOrderServiceImpl implements IEtOrderService
             afterDeductionFee = BigDecimal.ZERO;
             mark = "押金抵扣成功，骑行费【"+ridingFee+"】大于押金【"+deposit+"】";
             order1.setPayFee(deposit);//实际支付金额等于押金
+            order.setPayFee(deposit);//实际支付金额等于押金
         }else{
             // 押金大于订单金额  扣除后
             afterDeductionFee = deposit.subtract(ridingFee);
diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
index 5108e8c..4e69e1d 100644
--- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
@@ -455,7 +455,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getTotalIncome" resultType="java.lang.String">
-        select COALESCE(SUM(total_fee), 0)  from et_order where status = 4 and type = 1
+        select COALESCE(SUM(pay_fee), 0)  from et_order where status = 4 and type = 1
         <if test="timeStart != null  and timeStart != ''">
             AND DATE(create_time) &gt;= #{timeStart}
         </if>
@@ -466,7 +466,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getTotalUnpaid" resultType="java.lang.String" parameterType="String">
-        select  COALESCE(SUM(total_fee), 0)  from et_order where status = 3 and type = 1 and paid = 0
+        select  COALESCE(SUM(pay_fee), 0)  from et_order where status = 3 and type = 1 and paid = 0
         <if test="timeStart != null  and timeStart != ''">
             AND DATE(create_time) &gt;= #{timeStart}
         </if>
@@ -477,7 +477,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getTotalPaid" resultType="java.lang.String">
-        select  COALESCE(SUM(total_fee), 0)  from et_order where status = 4 and type = 1 and paid = 1
+        select  COALESCE(SUM(pay_fee), 0)  from et_order where status = 4 and type = 1 and paid = 1
         <if test="timeStart != null  and timeStart != ''">
             and DATE(pay_time) &gt;= #{timeStart}
         </if>