From 4ddf07ce51f60e64d5170d3916864279d0f8a8fb Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 29 Apr 2022 09:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B8=85=E5=88=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AF=B9=E8=BF=90=E8=90=A5=E5=95=86ID=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/controller/XhpcClearingBankController.java    | 7 +++++--
 .../controller/XhpcClearingHistoryOrderController.java     | 5 +++--
 .../resources/mapper/XhpcClearingHistoryOrderMapper.xml    | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
index 6347b57c..d0c361d7 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
@@ -4,6 +4,7 @@ package com.xhpc.activity.controller;
 import com.xhpc.activity.domain.XhpcClearingBankDomain;
 import com.xhpc.activity.service.XhpcClearingBankService;
 import com.xhpc.common.core.domain.R;
+import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.common.log.annotation.Log;
@@ -33,8 +34,11 @@ public class XhpcClearingBankController extends BaseController {
                                  String status) {
 
         LoginUser loginUser = logUserUtils.getLogUser(request);
-        startPage();
+        if (loginUser.getSysUser().getOperatorId() == null){
+            throw new CustomException("请登陆运营商账户再试");
+        }
 
+        startPage();
         Map<String, Object> params = new HashMap<>();
         params.put("tenantId", loginUser.getTenantId());
         params.put("status", status);
@@ -70,7 +74,6 @@ public class XhpcClearingBankController extends BaseController {
     public R insertDomain(HttpServletRequest request, @RequestBody XhpcClearingBankDomain domain) {
 
         LoginUser loginUser = logUserUtils.getLogUser(request);
-
         if(domain.getOperatorId() == null){
             domain.setOperatorId(loginUser.getSysUser().getOperatorId());
         }
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
index ed75b1d1..f831ae0c 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
@@ -42,10 +42,11 @@ public class XhpcClearingHistoryOrderController extends BaseController {
                                            String operatorId,
                                            String stationId) {
         LoginUser loginUser = logUserUtils.getLogUser(request);
-        startPage();
-        if(StringUtils.isEmpty(operatorId)){
+        if(StringUtils.isEmpty(operatorId) && loginUser.getSysUser().getOperatorId() !=null){
             operatorId = loginUser.getSysUser().getOperatorId().toString();
         }
+
+        startPage();
         Map<String, Object> params = new HashMap<>();
         params.put("tenantId", loginUser.getTenantId());
         params.put("startTime", startTime);
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
index f6317c10..66f79b31 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
@@ -95,7 +95,7 @@
 
     <select id="selectCashAmount" resultType="map">
         select
-            ifnull(sum(ho.total_price), 0) as amount,
+            ifnull(sum(ho.act_power_price + ho.act_service_price), 0) as amount,
                group_concat(clearing_order_id) as clearingOrderIds
         from xhpc_clearing_history_order as ho
         where ho.check_status=2 and ho.del_flag=0 and ho.clearing_checkout_id is null and ho.operator_id=#{operatorId}