diff --git a/electripper-admin/src/main/resources/application-druid.yml b/electripper-admin/src/main/resources/application-druid.yml
index e174da8..355b4b5 100644
--- a/electripper-admin/src/main/resources/application-druid.yml
+++ b/electripper-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/ele2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 123456
 #                url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/vo/OperatingDataVo.java b/electripper-system/src/main/java/com/ruoyi/system/domain/vo/OperatingDataVo.java
index bec95e9..9322e67 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/domain/vo/OperatingDataVo.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/domain/vo/OperatingDataVo.java
@@ -34,7 +34,7 @@ public class OperatingDataVo {
         //累计待支付
         private String totalUnpaid;
 
-        //手续费
+        //手续费(支付手续费+平台服务费)
         private String handlingFee;
 
         //已支付
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
index 262111b..78f2fea 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
@@ -11,6 +11,8 @@ import com.ruoyi.system.mapper.EtCapitalFlowMapper;
 import com.ruoyi.system.domain.EtCapitalFlow;
 import com.ruoyi.system.service.IEtCapitalFlowService;
 
+import javax.annotation.Resource;
+
 /**
  * 资金流水Service业务层处理
  *
@@ -20,7 +22,7 @@ import com.ruoyi.system.service.IEtCapitalFlowService;
 @Service
 public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
 {
-    @Autowired
+    @Resource
     private EtCapitalFlowMapper etCapitalFlowMapper;
 
     /**
@@ -67,7 +69,14 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
     @DataScope(deptAlias = "d")
     public List<EtCapitalFlow> selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow)
     {
-        return etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow);
+        List<EtCapitalFlow> etCapitalFlows = etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow);
+        for (EtCapitalFlow flow : etCapitalFlows) {
+            if(flow.getOwnerType().equals("1")){
+//                flow.getOwnerId()
+            }
+        }
+
+        return etCapitalFlows;
     }
 
     /**
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 eabd61c..9538f09 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
@@ -1356,7 +1356,7 @@ public class EtOrderServiceImpl implements IEtOrderService
             //handlingFee 手续费 = 0.0054 * 已支付金额
             BigDecimal handlingFee = etCapitalFlowMapper.getHandlingFee(timeStart, timeEnd, null, Long.parseLong(areaId));//手续费,扣除掉退款部分的
             BigDecimal platformServiceFee = etCapitalFlowMapper.getServiceFee(timeStart, timeEnd, null,Long.parseLong(areaId));//平台服务费 ,扣除掉退款部分的
-            income.setHandlingFee(handlingFee.toString());
+            income.setHandlingFee(handlingFee.add(platformServiceFee).toString());
 
             // 总营收 = 已支付 - 已退款 - 手续费
             income.setTotalIncome(new BigDecimal(totalPaid).subtract(new BigDecimal(totalRefund)).subtract(handlingFee).subtract(platformServiceFee).toString());//总收入