From 17a10d4f1bc61734d9fc9de76c1c6bcf792c8545 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Mon, 13 May 2024 14:18:31 +0800
Subject: [PATCH] no message

---
 fuintAdmin_zt/src/api/allOrder.js             |   65 +-
 .../reconciliation/list.vue                   |  201 +---
 .../reconciliation/tab/ref.vue                |  168 +--
 .../reconciliation/tab/store.vue              |   44 +-
 .../reconciliation/tab/time.vue               |   15 +-
 .../reconciliation/tab/trading.vue            |  393 ++++---
 .../financialStatement/runningWater/list.vue  |  202 +---
 .../runningWater/tab/day.vue                  |   85 +-
 .../runningWater/tab/instituion.vue           | 1033 ++---------------
 .../runningWater/tab/none.vue                 |  164 +--
 .../runningWater/tab/oilDepot.vue             |   97 +-
 .../controller/AllOrderInfoController.java    |   76 ++
 .../business/order/dto/AllOrderInfoDto.java   |   13 +
 .../order/mapper/AllOrderInfoMapper.java      |   16 +
 .../order/mapper/xml/AllOrderInfoMapper.xml   |  253 +++-
 .../order/service/AllOrderInfoService.java    |   11 +
 .../service/impl/AllOrderInfoServiceImpl.java |  342 +++++-
 .../business/order/vo/AllOrderInfoVo.java     |   31 +
 .../service/impl/PrinterServiceImpl.java      |   10 +-
 .../business/store/service/StoreService.java  |    1 +
 .../store/service/impl/StoreServiceImpl.java  |    8 +
 .../fuint/common/service/StaffService.java    |    1 +
 .../common/service/impl/StaffServiceImpl.java |    4 +
 .../system/dept/mapper/SysDeptMapper.java     |    7 +
 .../system/dept/mapper/xml/SysDeptMapper.xml  |   37 +-
 .../com/fuint/system/dept/vo/SysDeptVo.java   |   26 +
 .../fuint/repository/mapper/MtUserMapper.java |    1 +
 .../main/resources/mapper/MtUserMapper.xml    |    4 +
 28 files changed, 1564 insertions(+), 1744 deletions(-)
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/vo/SysDeptVo.java

diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js
index e7496c469..4b5472f1b 100644
--- a/fuintAdmin_zt/src/api/allOrder.js
+++ b/fuintAdmin_zt/src/api/allOrder.js
@@ -26,4 +26,67 @@ export function getOrderInfo(orderId) {
     method: 'post',
     data: data
   })
-}
\ No newline at end of file
+}
+
+export function getTradingPageApi(query) {
+  return request({
+    url: 'business/allOrderInfo/trading',
+    method: 'get',
+    params: query
+
+  })
+}
+export function getInstituionListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByInstituion',
+    method: 'get',
+    params: query
+
+  })
+}
+
+export function getNoneListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByNone',
+    method: 'get',
+    params: query
+
+  })
+}
+
+export function getDayListApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByDay',
+    method: 'get',
+    params: query
+
+  })
+}
+//统计
+export function getRunningWaterByDataApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByData',
+    method: 'get',
+    params: query
+
+  })
+}
+//统计
+export function getRunningWaterByTissueApi(query) {
+  return request({
+    url: 'business/allOrderInfo/runningWaterByTissue',
+    method: 'get',
+    params: query
+
+  })
+}
+
+//统计
+export function getTissueByDataApi(query) {
+  return request({
+    url: 'business/allOrderInfo/getTradingData',
+    method: 'get',
+    params: query
+
+  })
+}
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue
index e5f3a6344..d23ca2530 100644
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/list.vue
@@ -1,163 +1,64 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="有效" value="A"/>
-          <el-option key="N" label="无效" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="80"/>
-      <el-table-column label="会员ID" align="center" prop="userId" />
-      <el-table-column label="手机号" align="center" prop="userInfo.mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.mobile">{{ scope.row.userInfo.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="userInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.name">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="变动数量" align="center" prop="amount">
-         <template slot-scope="scope">
-             <span v-if="scope.row.amount > 0" style="color:forestgreen">+{{ scope.row.amount }}</span>
-             <span v-else style="color:red">{{ scope.row.amount }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-        <template slot-scope="scope">
-          <span v-if="scope.row.description">{{ scope.row.description }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.operator">{{ scope.row.operator }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+  <div class="app-center">
+    <div class="app-top">
+      <el-card >
+        <el-radio-group v-model="radio1">
+          <el-radio-button label="交易明细"></el-radio-button>
+          <el-radio-button label="退款明细"></el-radio-button>
+<!--          <el-radio-button label="按时间统计手续费"></el-radio-button>-->
+<!--          <el-radio-button label="按门店统计手续费"></el-radio-button>-->
+        </el-radio-group>
+      </el-card>
+    </div>
+    <reconciliation-trading v-if="radio1 == '交易明细' "></reconciliation-trading>
+    <reconciliation-ref v-if="radio1 == '退款明细' "></reconciliation-ref>
+    <reconciliation-time v-if="radio1 == '按时间统计手续费' "></reconciliation-time>
+    <reconciliation-store v-if="radio1 == '按门店统计手续费' "></reconciliation-store>
   </div>
 </template>
 
 <script>
-import { getBalanceList } from "@/api/balance";
+
+import ReconciliationTrading from "@/views/financialStatement/reconciliation/tab/trading.vue";
+import ReconciliationRef from "@/views/financialStatement/reconciliation/tab/ref.vue";
+import ReconciliationTime from "@/views/financialStatement/reconciliation/tab/time.vue";
+import ReconciliationStore from "@/views/financialStatement/reconciliation/tab/store.vue";
+
 export default {
-  name: "BalanceList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        orderSn: '',
-        status: ''
-      }
-    };
+  name: "reconciliation-list",
+  data(){
+    return{
+      radio1:'交易明细'
+    }
   },
-  created() {
-    this.getList();
+  components:{
+    ReconciliationStore,
+    ReconciliationTime,
+    ReconciliationRef,
+    ReconciliationTrading
   },
   methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getBalanceList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.catchTypeList = response.data.catchTypeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+    handleClick(tab, event) {
+      console.log(tab, event);
     }
   }
-};
+
+}
 </script>
 
+<style scoped>
+.app-center{
+  width: 100%;
+
+  box-sizing: border-box;
+  padding: 10px;
+}
+.app-top{
+  width: 100%;
+  margin-bottom: 20px;
+  height: 60px;
+  box-sizing: border-box;
+
+}
+
+</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
index 79568a640..d6640afca 100644
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -52,28 +52,18 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
+      </div>
       <div class="box-gang">
         <div class="box">
-          <div class="size-hui">交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-hui">退款笔数</div>
+          <div class="size-bole">{{
+              orderStatistics.refBalanceCount }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">笔单价</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-hui">退款余额</div>
+          <div class="size-bole">{{ orderStatistics.refBalance }}</div>
         </div>
+
       </div>
     </el-card>
     <el-card class="box-card">
@@ -85,64 +75,60 @@
           :data="orderList"
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
+          <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
           <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
+          <el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
+          <el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
+          <el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
+          <el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
+          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>
+          <el-table-column prop="type" align="center" label="订单来源">
 
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
+          </el-table-column>
+          <el-table-column prop="amount" align="center" label="所属模块"> </el-table-column>
+          <el-table-column prop="payType" align="center" label="支付方式">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
+              <span v-if="scope.row.payType=='CASH'">现金</span>
+              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
+              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
+              <span v-else="">余额</span>
             </template>
           </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
-          </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-          </el-table-column>
-
 
+<!--          <el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>-->
+<!--          <el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>-->
+          <el-table-column prop="payMoney" align="center" label="退款金额"> </el-table-column>
+<!--          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>-->
+          <!--          <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
+          <el-table-column prop="userName" align="center" label="付款用户" width="110"> </el-table-column>
+          <el-table-column prop="reasonRefund" align="content" label="备注" width="110"> </el-table-column>
+          <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button style="width: 60px" size="mini"
+                         @click="getOrdersInfo(scope.row)"
+                         type="success" plain round>详情</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
+<!--      <div class="pagination-box">-->
+<!--        <el-pagination-->
+<!--          background-->
+<!--          v-show="total>0"-->
+<!--          layout="prev, pager, next"-->
+<!--          :total="total"-->
+<!--          :page.sync="queryParams.page"-->
+<!--          :limit.sync="queryParams.pageSize"-->
+<!--          @current-change="getList">-->
+<!--        </el-pagination>-->
+<!--      </div>-->
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
 
     </el-card>
   </div>
@@ -150,13 +136,18 @@
 
 <script>
 
+import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from "@/api/allOrder";
+
   export default {
-    name: "reconciliation-trading",
+    name: "reconciliation-ref",
     data(){
       return{
         radio1:"油号选错",
         loading:false,
+        dialogVisible:false,
+        ordersInfo: {},
         // 员工列表
+        deptList:[],
         staffList:[],
         // 日期范围
         dateRange: [],
@@ -172,14 +163,14 @@
           pageSize: 10,
           beginTime:"",
           endTime:"",
+          orderNo:"",
+          status:"refund",
+          payType:"",
+          payChannel:"",
         },
         orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
+          refBalance:"0",
+          refBalanceCount:"0",
         },
         total:0,
       }
@@ -195,10 +186,14 @@
       this.endTime = new Date()
       this.isSysDate = true
       this.getList();
+      this.getDeptList();
 
     },
     methods:{
-
+      getOrdersInfo(data) {
+        this.dialogVisible = true;
+        this.ordersInfo = data
+      },
       exportExcelCashier() {
         let dateRange = []
         if (this.beginTime && this.endTime) {
@@ -218,22 +213,27 @@
           dateRange.push(this.beginTime.toLocaleDateString())
           dateRange.push(this.endTime.toLocaleDateString())
         }
-        // orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   this.orderStatistics = res.data
-        // })
+        getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+          this.orderStatistics = res.data
+        })
       },
 
+
       // 获取列表信息
       getList(val){
 
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
+        getTradingPageApi(this.addDateRange(this.queryParams)).then( response => {
+          this.orderList = response.data.records;
+          this.total = response.data.total;
+          this.isSysDate = false
+        })
         this.getOrderStatistics()
       },
-
+      getDeptList() {
+        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
+          this.deptList = response.data.records;
+        })
+      },
       // 搜索按钮操作
       handleQuery() {
         this.queryParams.page = 1;
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue
index 79568a640..4d5ffa135 100644
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/store.vue
@@ -52,28 +52,28 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
+      </div>
       <div class="box-gang">
-        <div class="box">
-          <div class="size-hui">交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">笔单价</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
+      <div class="box">
+        <div class="size-hui">手续费合计</div>
+        <div class="size-bole">{{ 0 }}</div>
+      </div>
+      <div class="box">
+        <div class="size-hui">微信支付手续费</div>
+        <div class="size-bole">{{ 0 }}</div>
+      </div>
+      <div class="box">
+        <div class="size-hui">支付宝手续费</div>
+        <div class="size-bole">{{ 0 }}</div>
+      </div>
+      <div class="box">
+        <div class="size-hui">银行卡手续费</div>
+        <div class="size-bole">{{ 0 }}</div>
+      </div>
+      <div class="box">
+        <div class="size-hui">银联云闪付手续费</div>
+        <div class="size-bole">{{ 0 }}</div>
+      </div>
       </div>
     </el-card>
     <el-card class="box-card">
@@ -151,7 +151,7 @@
 <script>
 
   export default {
-    name: "reconciliation-trading",
+    name: "reconciliation-store",
     data(){
       return{
         radio1:"油号选错",
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue
index 79568a640..8f179bf8c 100644
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/time.vue
@@ -52,26 +52,26 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
+      </div>
       <div class="box-gang">
         <div class="box">
-          <div class="size-hui">交易金额</div>
+          <div class="size-hui">手续费合计</div>
           <div class="size-bole">{{ 0 }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">交易笔数</div>
+          <div class="size-hui">微信支付手续费</div>
           <div class="size-bole">{{ 0 }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">笔单价</div>
+          <div class="size-hui">支付宝手续费</div>
           <div class="size-bole">{{ 0 }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">日均交易金额</div>
+          <div class="size-hui">银行卡手续费</div>
           <div class="size-bole">{{ 0 }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">日均交易笔数</div>
+          <div class="size-hui">银联云闪付手续费</div>
           <div class="size-bole">{{ 0 }}</div>
         </div>
       </div>
@@ -151,10 +151,9 @@
 <script>
 
   export default {
-    name: "reconciliation-trading",
+    name: "reconciliation-time",
     data(){
       return{
-        radio1:"油号选错",
         loading:false,
         // 员工列表
         staffList:[],
diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
index 6c69767a8..03da7b1b5 100644
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -2,162 +2,270 @@
 <template>
   <div style="margin-top: 30px">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
+        <el-form-item label="流水编号：">
+          <el-input v-model="queryParams.orderNo"></el-input>
+        </el-form-item>
+        <el-form-item label="交易时间：">
+          <!--          <el-date-picker-->
+          <!--            v-model="dateRange"-->
+          <!--            style="width: 400px"-->
+          <!--            size="medium"-->
+          <!--            value-format="yyyy-MM-dd"-->
+          <!--            type="datetimerange"-->
+          <!--            range-separator="至"-->
+          <!--            start-placeholder="开始日期"-->
+          <!--            end-placeholder="结束日期"-->
+          <!--          ></el-date-picker>-->
+          <el-date-picker
+            v-model="beginTime"
+            style="width: 140px"
+            type="date"
+            placeholder="开始日期">
+          </el-date-picker>
+          至
+          <el-date-picker
+            v-model="endTime"
+            style="width: 140px"
+            type="date"
+            placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="机构：" prop="deptId">
+          <el-select
+            v-model="queryParams.deptId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
+            </el-option>
+
+
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付渠道：" prop="payChannel">
+          <el-select
+            v-model="queryParams.payChannel"
+            clearable
+            placeholder="全部"
+          >
+            <el-option label="小程序" value="applet"/>
+            <el-option label="收银台" value="cashier"/>
+            <el-option label="POS端" value="POS"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付方式：" prop="payType">
+          <el-select
+            v-model="queryParams.payType"
+            clearable
+            placeholder="全部"
+          >
+            <el-option label="现金" value="CASH"/>
+            <el-option label="微信" value="WECHAT"/>
+            <el-option label="支付宝" value="ALIPAY"/>
+            <el-option label="余额" value="balance"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付状态 ：" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            clearable
+            placeholder="全部"
+          >
+            <el-option label="已支付" value="paid"/>
+            <el-option label="未支付" value="unpaid"/>
+            <el-option label="已退款" value="refund"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
+
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="box-card">
+<!--      <div slot="header" class="clearfix">-->
+<!--        <span>收银台订单统计</span>-->
+<!--      </div>-->
       <div class="box-gang">
         <div class="box">
-          <div class="size-hui">交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-hui">微信收款</div>
+          <div class="size-bole">{{ orderStatistics.cash }}元/{{orderStatistics.cashcount}}笔</div>
         </div>
         <div class="box">
-          <div class="size-hui">交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-hui">支付宝收款</div>
+          <div class="size-bole">{{ orderStatistics.wechat }}元/{{orderStatistics.wechatcount}}笔</div>
         </div>
         <div class="box">
-          <div class="size-hui">笔单价</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-hui">会员钱包收款</div>
+          <div class="size-bole">{{ orderStatistics.alipay }}元/{{orderStatistics.alipaycount}}笔</div>
         </div>
+<!--        <div class="box">-->
+<!--          <div class="size-hui">银行卡收款</div>-->
+<!--          <div class="size-bole">{{ 0 }}元/{{0}}笔</div>-->
+<!--        </div>-->
+<!--        <div class="box">-->
+<!--          <div class="size-hui">银联云闪付收款</div>-->
+<!--          <div class="size-bole">{{ 0 }}元/{{0}}笔</div>-->
+<!--        </div>-->
         <div class="box">
-          <div class="size-hui">日均交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-hui">现金支付收款</div>
+          <div class="size-bole">{{ orderStatistics.balance }}元/{{orderStatistics.balanceCount}}笔</div>
         </div>
       </div>
     </el-card>
     <el-card class="box-card">
       <div class="wgang">
         <div>机构流水分析列表</div>
-        <div style="display: flex ">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
-            <el-form-item label="交易时间：">
-              <!--          <el-date-picker-->
-              <!--            v-model="dateRange"-->
-              <!--            style="width: 400px"-->
-              <!--            size="medium"-->
-              <!--            value-format="yyyy-MM-dd"-->
-              <!--            type="datetimerange"-->
-              <!--            range-separator="至"-->
-              <!--            start-placeholder="开始日期"-->
-              <!--            end-placeholder="结束日期"-->
-              <!--          ></el-date-picker>-->
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 140px"
-                type="date"
-                placeholder="开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="endTime"
-                style="width: 140px"
-                type="date"
-                placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="机构：" prop="staffId">
-              <el-select
-                v-model="queryParams.staffId"
-                clearable
-                placeholder="全部"
-              >
-                <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-                  <span style="float: left">{{ item.realName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-            </el-form-item>
-          </el-form>
-        </div>
       </div>
       <div class="table-box">
         <el-table
           :data="orderList"
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
+          <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
           <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
+          <el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
+          <el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
+          <el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
+          <el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
+          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>
+          <el-table-column prop="type" align="center" label="订单来源">
 
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
+          </el-table-column>
+          <el-table-column prop="amount" align="center" label="所属模块"> </el-table-column>
+          <el-table-column prop="payType" align="center" label="支付方式">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
+              <span v-if="scope.row.payType=='CASH'">现金</span>
+              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
+              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
+              <span v-else="">余额</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" align="center" label="支付状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
               <el-tag type="danger" v-else>支付失败</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
+          <el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>
+          <el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
+          <el-table-column prop="refMoney" align="center" label="退款金额"> </el-table-column>
+          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
+<!--          <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
+          <el-table-column prop="userName" align="center" label="付款用户" width="110"> </el-table-column>
+          <el-table-column prop="content" align="content" label="备注" width="110"> </el-table-column>
+          <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button style="width: 60px" size="mini"
+                         @click="getOrdersInfo(scope.row)"
+                         type="success" plain round>详情</el-button>
+            </template>
           </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-          </el-table-column>
-
-
         </el-table>
       </div>
-      <div class="pagination-box">
-        <el-pagination
-          background
-          v-show="total>0"
-          layout="prev, pager, next"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @current-change="getList">
-        </el-pagination>
-      </div>
+<!--      <div class="pagination-box">-->
+<!--        <el-pagination-->
+<!--          background-->
+<!--          v-show="total>0"-->
+<!--          layout="prev, pager, next"-->
+<!--          :total="total"-->
+<!--          :page.sync="queryParams.page"-->
+<!--          :limit.sync="queryParams.pageSize"-->
+<!--          @current-change="getList">-->
+<!--        </el-pagination>-->
+<!--      </div>-->
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
 
     </el-card>
+
+
+    <el-dialog
+      title="订单信息"
+      :visible.sync="dialogVisible">
+
+      <el-descriptions :title="'订单号：'+ordersInfo.orderNo">
+        <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item>
+        <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item>
+        <el-descriptions-item label="支付渠道">{{ordersInfo.payChannel}}</el-descriptions-item>
+        <el-descriptions-item label="商户号">{{ordersInfo.mchntCd}}</el-descriptions-item>
+        <el-descriptions-item label="费率">{{ordersInfo.amount}}</el-descriptions-item>
+        <el-descriptions-item label="订单来源">{{ordersInfo.type}}</el-descriptions-item>
+        <el-descriptions-item label="所属模块">{{ordersInfo.amount}}</el-descriptions-item>
+        <el-descriptions-item label="支付方式">{{ordersInfo.payType}}</el-descriptions-item>
+        <el-descriptions-item label="付款用户">{{ordersInfo.userName}}</el-descriptions-item>
+        <el-descriptions-item label="支付状态">{{ordersInfo.status}}</el-descriptions-item>
+        <el-descriptions-item label="备注">{{ordersInfo.content}}</el-descriptions-item>
+<!--        <el-descriptions-item label="备注">-->
+<!--          <el-tag size="small">学校</el-tag>-->
+<!--        </el-descriptions-item>-->
+      </el-descriptions>
+
+      <el-descriptions class="margin-top" title="金额详情" :column="3" border>
+        <el-descriptions-item>
+          <template slot="label">
+            订单金额
+          </template>
+          {{ordersInfo.goodsMoney?ordersInfo.goodsMoney:"--"}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            优惠后应付金额
+          </template>
+          {{ordersInfo.payMoney?ordersInfo.payMoney:"--"}}
+
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            退款金额
+          </template>
+          {{ordersInfo.refMoney?ordersInfo.refMoney:"--"}}
+
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            实收金额
+          </template>
+          {{ordersInfo.payMoney?ordersInfo.payMoney:"--"}}
+
+        </el-descriptions-item>
+      </el-descriptions>
+
+
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 
+import {
+  getRunningWaterByTissueApi,
+  getTissueByDataApi,
+  getTradingPageApi
+} from "@/api/allOrder";
+
   export default {
-    name: "runningWater-institution",
+    name: "reconciliation-trading",
     data(){
       return{
         radio1:"油号选错",
         loading:false,
+        dialogVisible:false,
         // 员工列表
         staffList:[],
+        ordersInfo:{},
         // 日期范围
         dateRange: [],
         beginTime:"",
@@ -166,20 +274,33 @@
         isSysDate:false,
         // 收银台订单列表
         orderList:[],
+        deptList:[],
+
         // 查询参数
         queryParams: {
           page: 1,
           pageSize: 10,
           beginTime:"",
           endTime:"",
+          orderNo:"",
+          status:"",
+          payType:"",
+          payChannel:"",
+          deptType:"3",
+          storeId:"",
+          deptId:"",
         },
         orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
+          CASH:"0",
+          WECHAT:"0",
+          ALIPAY:"0",
+          balance:"0",
+          CASHCount:"0",
+          WECHATCount:"0",
+          ALIPAYCount:"0",
+          balanceCount:"0",
+          refBalance:"0",
+          refBalanceCount:"0",
         },
         total:0,
       }
@@ -195,10 +316,15 @@
       this.endTime = new Date()
       this.isSysDate = true
       this.getList();
+      this.getDeptList();
 
     },
     methods:{
-
+      getDeptList() {
+        getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
+          this.deptList = response.data.records;
+        })
+      },
       exportExcelCashier() {
         let dateRange = []
         if (this.beginTime && this.endTime) {
@@ -218,22 +344,29 @@
           dateRange.push(this.beginTime.toLocaleDateString())
           dateRange.push(this.endTime.toLocaleDateString())
         }
-        // orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   this.orderStatistics = res.data
-        // })
+        getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+          this.orderStatistics = res.data
+        })
       },
 
       // 获取列表信息
       getList(val){
-
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
+        let dateRange = []
+        if (this.beginTime && this.endTime) {
+          dateRange.push(this.beginTime.toLocaleDateString())
+          dateRange.push(this.endTime.toLocaleDateString())
+        }
+        getTradingPageApi(this.addDateRange(this.queryParams),dateRange).then( response => {
+          this.orderList = response.data.records;
+          this.total = response.data.total;
+          this.isSysDate = false
+        })
         this.getOrderStatistics()
       },
-
+      getOrdersInfo(data) {
+        this.dialogVisible = true;
+        this.ordersInfo = data
+      },
       // 搜索按钮操作
       handleQuery() {
         this.queryParams.page = 1;
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue
index e5f3a6344..dd82a5c57 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/list.vue
@@ -1,163 +1,65 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" class="main-search" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input
-          v-model="queryParams.mobile"
-          placeholder="请输入会员手机号"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="状态"
-          clearable
-        >
-          <el-option key="A" label="有效" value="A"/>
-          <el-option key="N" label="无效" value="N"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="ID" prop="id" width="80"/>
-      <el-table-column label="会员ID" align="center" prop="userId" />
-      <el-table-column label="手机号" align="center" prop="userInfo.mobile">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.mobile">{{ scope.row.userInfo.mobile }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会员名称" align="center" prop="userInfo.name">
-        <template slot-scope="scope">
-          <span v-if="scope.row.userInfo.name">
-              <span>{{ scope.row.userInfo.name }}</span>
-          </span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="变动数量" align="center" prop="amount">
-         <template slot-scope="scope">
-             <span v-if="scope.row.amount > 0" style="color:forestgreen">+{{ scope.row.amount }}</span>
-             <span v-else style="color:red">{{ scope.row.amount }}</span>
-         </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-        <template slot-scope="scope">
-          <span v-if="scope.row.description">{{ scope.row.description }}</span>
-          <span v-else>无</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.createTime">{{ parseTime(scope.row.createTime) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span v-if="scope.row.operator">{{ scope.row.operator }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+  <div class="app-center">
+    <div class="app-top">
+      <el-card>
+        <el-radio-group v-model="radio1">
+          <el-radio-button label="机构流水分析"></el-radio-button>
+          <el-radio-button label="油站流水分析"></el-radio-button>
+          <el-radio-button label="无流水门店"></el-radio-button>
+          <el-radio-button label="日流水分析"></el-radio-button>
+        </el-radio-group>
+      </el-card>
+    </div>
+    <running-water-institution v-if="radio1 == '机构流水分析' "></running-water-institution>
+    <running-water-oil-depot v-if="radio1 == '油站流水分析' "></running-water-oil-depot>
+    <running-water-day v-if="radio1 == '日流水分析' "></running-water-day>
+    <running-water-none v-if="radio1 == '无流水门店' "></running-water-none>
   </div>
 </template>
 
 <script>
-import { getBalanceList } from "@/api/balance";
+
+
+import RunningWaterInstitution from "@/views/financialStatement/runningWater/tab/instituion.vue";
+import RunningWaterOilDepot from "@/views/financialStatement/runningWater/tab/oilDepot.vue";
+import RunningWaterDay from "@/views/financialStatement/runningWater/tab/day.vue";
+import RunningWaterNone from "@/views/financialStatement/runningWater/tab/none.vue";
+
 export default {
-  name: "BalanceList",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      // 默认排序
-      defaultSort: {prop: 'createTime', order: 'descending'},
-      // 查询参数
-      queryParams: {
-        page: 1,
-        pageSize: 10,
-        mobile: '',
-        userId: '',
-        orderSn: '',
-        status: ''
-      }
-    };
+  name: "runningWater-list",
+  data(){
+    return{
+      radio1:'机构流水分析'
+    }
   },
-  created() {
-    this.getList();
+  components:{
+    RunningWaterNone,
+    RunningWaterDay,
+    RunningWaterOilDepot,
+    RunningWaterInstitution
   },
   methods: {
-    // 查询列表
-    getList() {
-      this.loading = true;
-      getBalanceList(this.queryParams).then( response => {
-          this.list = response.data.paginationResponse.content;
-          this.total = response.data.paginationResponse.totalElements;
-          this.catchTypeList = response.data.catchTypeList
-          this.loading = false;
-        }
-      );
-    },
-    // 搜索按钮操作
-    handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
-    },
-    // 重置按钮操作
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.multiple = !selection.length
-    },
-    // 排序触发事件
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
+    handleClick(tab, event) {
+      console.log(tab, event);
     }
   }
-};
+
+}
 </script>
 
+<style scoped>
+.app-center{
+  width: 100%;
+
+  box-sizing: border-box;
+  padding: 10px;
+}
+.app-top{
+  width: 100%;
+  margin-bottom: 20px;
+  height: 60px;
+  box-sizing: border-box;
+
+}
+
+</style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
index 6c69767a8..805dc1924 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
@@ -4,7 +4,7 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
+      </div>
       <div class="box-gang">
         <div class="box">
           <div class="size-hui">交易金额</div>
@@ -32,9 +32,9 @@
       <div class="wgang">
         <div>机构流水分析列表</div>
         <div style="display: flex ">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="60px">
 
-            <el-form-item label="交易时间：">
+            <el-form-item label="时间：">
               <!--          <el-date-picker-->
               <!--            v-model="dateRange"-->
               <!--            style="width: 400px"-->
@@ -85,51 +85,29 @@
           :data="orderList"
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
+          <el-table-column prop="payTime" align="center" label="日期"></el-table-column>
+<!--          <el-table-column prop="seekZero" align="center" label="活跃机构数量"> </el-table-column>-->
+          <el-table-column prop="storeCount" align="center" label="活跃门店数量"> </el-table-column>
+          <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
+          <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
+          <el-table-column prop="unitPrice" align="center" label="笔单价">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
+              <span>{{scope.row.unitPrice}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
+          <el-table-column prop="dailyAmount" align="center" label="日均交易金额">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.amount / scope.row.storeCount).toFixed(2) }}</span>
+            </template>
           </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
+          <el-table-column prop="strokesPerDay" align="center" label="日均交易笔数">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.strokeCount / scope.row.storeCount).toFixed(2) }}</span>
+            </template>
           </el-table-column>
-
-
+<!--          <el-table-column prop="seekZero" align="center" label="机构日均交易金额"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="机构日均交易笔数"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="门店日均交易金额"> </el-table-column>-->
         </el-table>
       </div>
       <div class="pagination-box">
@@ -150,12 +128,15 @@
 
 <script>
 
+  import {getDayListApi} from "@/api/allOrder";
+
   export default {
-    name: "runningWater-institution",
+    name: "runningWater-day",
     data(){
       return{
         radio1:"油号选错",
         loading:false,
+        deptList:[],
         // 员工列表
         staffList:[],
         // 日期范围
@@ -225,12 +206,16 @@
 
       // 获取列表信息
       getList(val){
-
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
+        let dateRange = []
+        if (this.beginTime && this.endTime) {
+          dateRange.push(this.beginTime.toLocaleDateString())
+          dateRange.push(this.endTime.toLocaleDateString())
+        }
+        getDayListApi(this.addDateRange(this.queryParams, dateRange)).then( response => {
+          this.orderList = response.data.records;
+          this.total = response.data.total;
+          this.isSysDate = false
+        })
         this.getOrderStatistics()
       },
 
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
index 7fa32a218..a97d71781 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
@@ -1,188 +1,114 @@
 <!-- 收银台订单-->
 <template>
-  <div>
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="交易员工" prop="staffId">
-          <el-select
-            v-model="queryParams.staffId"
-            clearable
-            placeholder="全部"
-          >
-            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-              <span style="float: left">{{ item.realName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="订单号">
-          <el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input>
-        </el-form-item>
-        <el-form-item label="交易时间">
-<!--          <el-date-picker-->
-<!--            v-model="dateRange"-->
-<!--            style="width: 400px"-->
-<!--            size="medium"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            type="datetimerange"-->
-<!--            range-separator="至"-->
-<!--            start-placeholder="开始日期"-->
-<!--            end-placeholder="结束日期"-->
-<!--          ></el-date-picker>-->
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
-            至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
+  <div style="margin-top: 30px">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>收银台订单统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" style="display: flex;align-items: center;width: 250px">
-          <div>
-            <div class="size-hui">笔数</div>
-            <div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
-          </div>
-          <div style="margin-left: 30px">
-            <div class="size-hui" >油品笔数</div>
-            <div class="size-bole">{{ orderStatistics.numberOfStrokesByOil?orderStatistics.numberOfStrokesByOil:0 }}</div>
-          </div>
-          <div style="margin-left: 30px">
-            <div class="size-hui">商品笔数</div>
-            <div class="size-bole">{{ orderStatistics.numberOfStrokesByGoods?orderStatistics.numberOfStrokesByGoods:0 }}</div>
-          </div>
+        <div class="box">
+          <div class="size-hui">交易金额</div>
+          <div class="size-bole">{{ orderStatistics.amount }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">订单总金额</div>
-          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}</div>
+          <div class="size-hui">交易笔数</div>
+          <div class="size-bole">{{ orderStatistics.strokeCount }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">实付总金额</div>
-          <div class="size-bole">{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}</div>
+          <div class="size-hui">笔单价</div>
+          <div class="size-bole">{{ orderStatistics.unitPrice }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">油品优惠</div>
-          <div class="size-bole">{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}</div>
+          <div class="size-hui">日均交易金额</div>
+          <div class="size-bole">{{ orderStatistics.dailyAmount }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">油品总金额</div>
-          <div class="size-bole">{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}</div>
+          <div class="size-hui">日均交易笔数</div>
+          <div class="size-bole">{{ orderStatistics.strokesPerDay }}</div>
         </div>
         <div class="box">
-          <div class="size-hui">商品总金额</div>
-          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
+          <div class="size-hui">活跃机构数</div>
+          <div class="size-bole">{{ orderStatistics.inertiaStore }}</div>
         </div>
-        <div class="box">
-          <div class="size-hui">找零总金额</div>
-          <div class="size-bole">{{ seekZeroAmount }}</div>
-        </div>
-
       </div>
     </el-card>
     <el-card class="box-card">
       <div class="wgang">
-        <div>收银台订单列表</div>
+        <div>机构流水分析列表</div>
         <div style="display: flex ">
-          <el-button type="primary" size="mini" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
+
+            <el-form-item label="交易时间：">
+              <!--          <el-date-picker-->
+              <!--            v-model="dateRange"-->
+              <!--            style="width: 400px"-->
+              <!--            size="medium"-->
+              <!--            value-format="yyyy-MM-dd"-->
+              <!--            type="datetimerange"-->
+              <!--            range-separator="至"-->
+              <!--            start-placeholder="开始日期"-->
+              <!--            end-placeholder="结束日期"-->
+              <!--          ></el-date-picker>-->
+              <el-date-picker
+                v-model="beginTime"
+                style="width: 140px"
+                type="date"
+                placeholder="开始日期">
+              </el-date-picker>
+              至
+              <el-date-picker
+                v-model="endTime"
+                style="width: 140px"
+                type="date"
+                placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="机构类别：" prop="staffId">
+              <el-select
+                v-model="queryParams.deptType"
+                clearable
+                placeholder="全部"
+              >
+                <!--                //节点类型:1代理商2连锁店3基本门店4三方机构-->
+                <el-option   label="代理商" value="1"></el-option>
+                <el-option   label="三方机构" value="4"></el-option>
+                <el-option   label="连锁店" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="机构：" prop="deptId">
+              <el-select
+                v-model="queryParams.deptId"
+                clearable
+                placeholder="全部"
+              >
+                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
+                </el-option>
+
+
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
+
+            </el-form-item>
+          </el-form>
         </div>
       </div>
       <div class="table-box">
         <el-table
           :data="orderList"
           style="width: 100%">
-<!--          <el-table-column type="expand">-->
-<!--            <template slot-scope="props">-->
-<!--              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">-->
-<!--                <el-form-item label="收银员">-->
-<!--                  <span>{{ getRealName(staffList,props.row.staffId) }}</span>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item label="收银员手机号">-->
-<!--                  <span>{{ getMobile(staffList,props.row.staffId) }}</span>-->
-<!--                </el-form-item>-->
-<!--              </el-form>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
-            <template slot-scope="scope">
-              <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-            <template slot-scope="scope">
-              <span>{{ getRealName(staffList,scope.row.staffId) || '--' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button style="width: 60px" size="mini"
-                         @click="getOrdersInfo(scope.row.id)"
-                         type="success" plain round>详情</el-button>
-              <el-button style="width: 60px" size="mini"
-                         @click="patchwork(scope.row)"
-                         type="primary" plain round>补打</el-button>
-              <el-button style="width: 60px" size="mini"
-                         v-if = "scope.row.status === 'paid'"
-                         @click="handleRefund(scope.row.id)"
-                         type="danger" plain round>退款</el-button>
-            </template>
-          </el-table-column>
-
+          <el-table-column prop="deptId" align="center" label="机构编号" width="220"> </el-table-column>
+          <el-table-column prop="deptName" align="center" label="机构名称"> </el-table-column>
+          <el-table-column prop="inertiaStore" align="center" label="活跃门店数量"> </el-table-column>
+          <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
+          <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
+          <el-table-column prop="unitPrice" align="center" label="笔单价"> </el-table-column>
+          <el-table-column prop="dailyAmount" align="center" label="日均交易金额"> </el-table-column>
+          <el-table-column prop="strokesPerDay" align="center" label="日均交易笔数"> </el-table-column>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -198,365 +124,30 @@
       </div>
 
     </el-card>
-
-<!--    订单详情-->
-    <el-dialog
-      title="订单详情"
-      :visible.sync="dialogVisible">
-      <div>
-        <el-descriptions>
-          <el-descriptions-item label="收银员姓名">{{ cashierOrder.realName }}</el-descriptions-item>
-          <el-descriptions-item label="收银员账号">{{ cashierOrder.mobile }}</el-descriptions-item>
-          <el-descriptions-item label="订单编号">{{ cashierOrder.orderNo }}</el-descriptions-item>
-          <el-descriptions-item label="订单金额">{{ cashierOrder.amount }}</el-descriptions-item>
-          <el-descriptions-item label="油品金额">{{ cashierOrder.oilOrderAmount }}</el-descriptions-item>
-          <el-descriptions-item label="商品金额">{{ cashierOrder.goodsOrderAmount }}</el-descriptions-item>
-          <el-descriptions-item label="油品优惠券优惠">
-            <span v-if="oilInfo.length>0">{{ oilInfo[0].couponAmount || 0 }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="油品满减/折扣活动优惠">
-            <span v-if="oilInfo.length>0">{{ oilInfo[0].deductionAmount || 0 }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="油品会员等级优惠">
-            <span v-if="oilInfo.length>0">{{ cashierOrder.oilDiscountAmount - oilInfo[0].deductionAmount - oilInfo[0].couponAmount || 0 }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
-          <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
-          <el-descriptions-item label="油品实付总额">{{ cashierOrder.oilPayAmount }}</el-descriptions-item>
-          <el-descriptions-item label="商品实付总额">{{ cashierOrder.goodsPayAmount }}</el-descriptions-item>
-          <el-descriptions-item label="实付金额">{{ cashierOrder.payAmount }}</el-descriptions-item>
-          <el-descriptions-item label="储值卡消费金额">
-            <span v-if="oilInfo.length>0">{{ oilInfo[0].balanceAmount }}</span>
-            <span v-else>0</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="囤油卡消费升数">
-            <span v-if="oilInfo.length>0">{{ oilInfo[0].oilCardAmount }}</span>
-            <span v-else>0</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="找零金额">{{ cashierOrder.seekZero }}</el-descriptions-item>
-          <el-descriptions-item label="付款方式">
-            <span v-if="cashierOrder.payType == 'CASH'">现金</span>
-            <span v-else-if="cashierOrder.payType == 'WECHAT'">微信</span>
-            <span v-else-if="cashierOrder.payType == 'ALIPAY'">支付宝</span>
-            <span v-else-if="cashierOrder.payType == 'UNIONPAY'">银联二维码</span>
-            <span v-else-if="cashierOrder.payType == 'oilCard'">囤油卡</span>
-            <span v-else-if="cashierOrder.payType == 'balance'">储值卡</span>
-            <span v-else-if="cashierOrder.payType == 'credit'">挂账</span>
-            <span v-else>小程序码</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="付款状态">
-            <el-tag v-if="cashierOrder.status == 'unpaid'">未支付</el-tag>
-            <el-tag type="success" v-else-if="cashierOrder.status == 'paid'">已支付</el-tag>
-            <el-tag type="warning" v-else-if="cashierOrder.status == 'payFail'">支付失败</el-tag>
-            <el-tag type="danger" v-else-if="cashierOrder.status == 'refund'">已退款</el-tag>
-            <el-tag type="info" v-else>退款中</el-tag>
-          </el-descriptions-item>
-          <el-descriptions-item label="交易时间">
-            {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime):"--" }}
-          </el-descriptions-item>
-        </el-descriptions>
-      </div>
-      <div style="margin-top: 30px">
-        <el-descriptions :column="1" direction="vertical">
-          <el-descriptions-item label="油品详情">
-            <el-table
-              v-loading="loading"
-
-              :data="oilInfo"
-              style="width: 100%">
-              <el-table-column label="油号油枪" prop="terminal">
-                <template slot-scope="scope">
-                  <span>{{ getName(oilNameList,scope.row.oils) }}/{{ getName1(oilGunList,scope.row.oilGunNum) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="油品金额" align="center" prop="orderAmount">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.orderAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="加油升数" align="center" prop="oilNum" >
-                <template slot-scope="scope">
-                  <span>{{ scope.row.oilNum }}L</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="油品单价" align="center" prop="amount">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.oilPrice }}/L</span>
-                </template>
-              </el-table-column>
-<!--              <el-table-column label="满减活动优惠" align="center" prop="activeId">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span v-if="scope.row.activeType==1">{{ scope.row.deductionAmount }}</span>-->
-<!--                  <span v-else>0</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="折扣活动优惠" align="center" prop="activeId">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span v-if="scope.row.activeType==2">{{ scope.row.deductionAmount }}</span>-->
-<!--                  <span v-else>0</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-            </el-table>
-          </el-descriptions-item>
-          <el-descriptions-item label="商品详情">
-            <el-table
-              :data="goodsInfo"
-              style="width: 100%">
-              <el-table-column label="商品名称" prop="name"/>
-              <el-table-column label="单价" align="center" prop="retailPrice">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.retailPrice }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column v-if="cashierOrder.payUser != '散客'" label="会员价" align="center" prop="retailPrice">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.memberPrice }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="数量" align="center" prop="num"/>
-              <el-table-column label="合计金额" align="center" prop="num">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.allAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="实付金额" align="center" prop="num">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.payAmount }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-descriptions-item>
-        </el-descriptions>
-      </div>
-    </el-dialog>
-<!--    订单退款-->
-    <el-dialog
-      :close-on-click-modal="false"
-      title="订单退款"
-      width="25%"
-      :visible.sync="dialogRefund">
-      <div style="text-align: center;font-weight: bold">
-<!--        ￥<span style="font-size: 35px">{{ cashierOrder.payAmount }}</span>-->
-        ￥<span style="font-size: 35px">{{ cashierOrder.goodsPayAmount + cashierOrder.oilPayAmount }}</span>
-      </div>
-      <div class="tk">退款金额</div>
-      <div class="tk">退款单号：{{ cashierOrder.orderNo }}</div>
-
-      <span>退款内容：</span>
-      <br>
-      <span>商品：</span>
-      <el-checkbox v-model="isGoods" @click="calculateRefunds()">￥{{cashierOrder.goodsPayAmount}}</el-checkbox>
-      <br>
-
-
-
-      <span>油品：</span>
-      <template >
-        <el-checkbox v-if="oilInfo.length > 0" v-model="isOil" @click="calculateRefunds()">
-
-          <span v-if="oilInfo[0].payAmount && oilInfo[0].payAmount!='0.00'"> ￥{{cashierOrder.oilPayAmount}}</span>
-          <span v-if="oilInfo[0].balanceAmount>0">储值卡：{{oilInfo[0].balanceAmount}} </span>
-          <span v-if="oilInfo[0].oilCardAmount>0">屯油卡：{{ oilInfo[0].oilCardAmount}} </span>
-        </el-checkbox>
-        <el-checkbox v-if="isOil && oilInfo.length > 0 && oilInfo[0].couponId" v-model="isOilVouchers">优惠卷</el-checkbox>
-
-<!--        <el-checkbox v-if="oilInfo.length > 0 && oilInfo[0].balanceAmount>0" v-model="isOilCard">储值卡：{{oilInfo[0].balanceAmount}}</el-checkbox>-->
-<!--        <el-checkbox v-if="oilInfo.length > 0 && oilInfo[0].oilCardAmount>0" v-model="isOilFuel">屯油卡：{{ oilInfo[0].oilCardAmount }}</el-checkbox>-->
-      </template>
-
-
-      <div style="margin: 10px 0">
-        退款原因<br/>
-        <el-radio-group v-model="radio1" style="margin: 10px 0">
-          <el-radio-button label="油号选错"></el-radio-button>
-          <el-radio-button label="金额错误"></el-radio-button>
-          <el-radio-button label="其他原因"></el-radio-button>
-        </el-radio-group>
-      </div>
-      <div>
-        <el-input placeholder="请输入退款原因" v-model="refundRemark"></el-input>
-        <br/>
-<!--        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>-->
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogRefund = false">取 消</el-button>
-        <el-button type="primary" @click="refundConfirmed()">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <!--    支付成功后小票打印内容-->
-    <div id="reportSuccess" ref="report" class="box-center" v-show="false">
-      <div class="box-title">订单统计</div>
-      <div class="box-ge">
-        <div v-for="item in oilInfo" :key="item.id">
-          <div class="input-box">
-            <div>{{ getName(oilNameList,item.oils) }}/{{ getName1(oilGunList,item.oilGunNum) }}</div>
-            <div>￥{{ item.orderAmount }}</div>
-          </div>
-          <div class="input-box">
-            <div>加油升数</div>
-            <div>{{ item.oilNum }}L</div>
-          </div>
-        </div>
-        <div v-for="item in goodsInfo" :key="item.id">
-          <div class="input-box">
-            <div>商品名称</div>
-            <div>{{ item.name }}</div>
-          </div>
-          <div class="input-box">
-            <div>商品数量</div>
-            <div>{{ item.num }}{{ item.unit }}</div>
-          </div>
-          <div class="input-box" v-if="!cashierOrder.userId">
-            <div>商品单价</div>
-            <div>￥{{ item.retailPrice }}</div>
-          </div>
-          <div class="input-box" v-else>
-            <div>商品单价</div>
-            <div>￥{{ item.memberPrice }}</div>
-          </div>
-        </div>
-        <div class="input-box">
-          <div>支付方式</div>
-          <div v-if="cashierOrder.payType == 'CASH'">现金</div>
-          <div v-else-if="cashierOrder.payType == 'WECHAT'">微信</div>
-          <div v-else-if="cashierOrder.payType == 'ALIPAY'">支付宝</div>
-          <div v-else-if="cashierOrder.payType == 'UNIONPAY'">银联二维码</div>
-          <div v-else>小程序码</div>
-        </div>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥{{ cashierOrder.amount }}</div>
-        </div>
-        <div class="input-box">
-          <div>实付款</div>
-          <div>￥{{ cashierOrder.payAmount }}</div>
-        </div>
-        <div class="input-box" v-if="cashierOrder.seekZero>0">
-          <div>找零金额</div>
-          <div>￥{{ cashierOrder.seekZero }}</div>
-        </div>
-      </div>
-    </div>
-
-
-    <div id="reportSuccess2" ref="report2" class="box-center" v-show="false">
-      <div class="box-title">订单退款</div>
-      <div class="box-ge">
-        <div v-if="isOil" v-for="item in oilInfo" :key="item.id">
-          <div class="input-box">
-            <div>{{ getName(oilNameList,item.oils) }}/{{ getName1(oilGunList,item.oilGunNum) }}</div>
-            <div>￥{{ item.orderAmount }}</div>
-          </div>
-          <div class="input-box">
-            <div>加油升数</div>
-            <div>{{ item.oilNum }}L</div>
-          </div>
-        </div>
-        <div v-if="isOil">
-          <div  v-if="oilInfo[0].balanceAmount>0" class="input-box">
-            <div>储值卡</div>
-            <div>{{oilInfo[0].balanceAmount}}</div>
-          </div>
-          <div  v-if="oilInfo[0].oilCardAmount>0" class="input-box">
-            <div>屯油卡</div>
-            <div>{{ oilInfo[0].oilCardAmount}}</div>
-          </div>
-        </div>
-
-
-        <div v-if="isGoods" v-for="item in goodsInfo" :key="item.id">
-          <div class="input-box">
-            <div>商品名称:</div>
-            <div>{{ item.name }}</div>
-          </div>
-          <div class="input-box">
-            <div>商品数量:</div>
-            <div>{{ item.num }}{{ item.unit }}</div>
-          </div>
-          <div class="input-box" v-if="!cashierOrder.userId">
-            <div>商品单价:</div>
-            <div>￥{{ item.retailPrice }}</div>
-          </div>
-          <div class="input-box" v-else>
-            <div>商品单价:</div>
-            <div>￥{{ item.memberPrice }}</div>
-          </div>
-        </div>
-        <div class="input-box">
-          <div>支付方式</div>
-          <div v-if="cashierOrder.payType == 'CASH'">现金</div>
-          <div v-else-if="cashierOrder.payType == 'WECHAT'">微信</div>
-          <div v-else-if="cashierOrder.payType == 'ALIPAY'">支付宝</div>
-          <div v-else-if="cashierOrder.payType == 'UNIONPAY'">银联二维码</div>
-          <div v-else>小程序码</div>
-        </div>
-        <div class="input-box">
-          <div>合计:</div>
-          <div>￥{{ cashierOrder.amount }}</div>
-        </div>
-
-        <div class="input-box">
-          <div>实退款:</div>
-          <div>￥{{ calculateRefundsV }}</div>
-        </div>
-      </div>
-    </div>
-
   </div>
 </template>
 
 <script>
+
 import {
-  cashierOrder,
-  cashierOrderSeekZeroAmount,
-  listCashierOrder,
-  orderStatisticsApi
-} from "@/api/cashier/cashierorder";
-import {queryStaffs} from "@/api/cashier/staff";
-import {oilOrderList, oilOrders} from "@/api/cashier/oilorder";
-import {getOilNameList} from "@/api/cashier/oilnumgun";
-import {getOrderGoods} from "@/api/cashier/goodsorder";
-import {exportExcelCashierApi} from "@/api/order/exportExcel";
-import {refundApi} from "@/api/cashier/refund";
-import {connectFlag, getLodop} from "@/api/LodopFuncs";
-import {getOilNumberGun} from "@/api/cashier/oilGuns";
-import {formatDate} from "@/utils";
-import ScanPayCodeDialog from "@/views/cashier/components/scanPayCodeDialog.vue";
-import {rePrintOilOrderReport} from "@/api/print";
+  getInstituionListApi,
+  getRunningWaterByDataApi,
+  getRunningWaterByTissueApi
+} from "@/api/allOrder";
 
   export default {
-    name: "order_Cashier",
-    components: {ScanPayCodeDialog},
+    name: "runningWater-institution",
     data(){
       return{
-        calculateRefundsV:0,
-        // 退款备注
-        refundRemark:"",
         radio1:"油号选错",
-        // 油号列表
-        oilNameList:[],
-        // 油品订单详情列表
-        oilInfo:[],
-        // 商品订单详情列表
-        goodsInfo:[],
-        oilGunList:[],
-        // 收银员订单详情
-        cashierOrder:{},
         loading:false,
-        dialogVisible:false,
-        dialogRefund:false,
+        deptList:[],
         // 员工列表
         staffList:[],
         // 日期范围
         dateRange: [],
         beginTime:"",
         endTime:"",
-        isOilVouchers:false,
-        isGoods: false,
-        isOil: false,
-        isOilCard: false,  // 是否推掉油卡
-        isOilFuel: false, //是否推掉储值卡
         // 是否为当天时间
         isSysDate:false,
         // 收银台订单列表
@@ -567,17 +158,19 @@ import {rePrintOilOrderReport} from "@/api/print";
           pageSize: 10,
           beginTime:"",
           endTime:"",
+          deptId:"",
+          deptType:"1",
+
         },
         orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
+          amount:'0',
+          strokeCount:'0',
+          unitPrice:'0',
+          dailyAmount:'0',
+          strokesPerDay:'0',
+          inertiaStore:'0',
         },
         total:0,
-        seekZeroAmount:0,
       }
     },
     created() {
@@ -591,9 +184,9 @@ import {rePrintOilOrderReport} from "@/api/print";
       this.endTime = new Date()
       this.isSysDate = true
       this.getList();
+      this.getDeptList();
       // this.getOrderStatistics();
-      this.getStaffList();
-      this.getOilGunList();
+
     },
     methods:{
 
@@ -603,10 +196,10 @@ import {rePrintOilOrderReport} from "@/api/print";
           dateRange.push(this.beginTime.toLocaleDateString())
           dateRange.push(this.endTime.toLocaleDateString())
         }
-        exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'收银台订单统计.xLsx')
-        })
+        // exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+        //   const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+        //   this.$download.saveAs(blob,'收银台订单统计.xLsx')
+        // })
       },
       // 获取订单统计信息
 
@@ -616,429 +209,28 @@ import {rePrintOilOrderReport} from "@/api/print";
           dateRange.push(this.beginTime.toLocaleDateString())
           dateRange.push(this.endTime.toLocaleDateString())
         }
-        orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+        getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
           this.orderStatistics = res.data
         })
       },
-      // 获取员工姓名
-      getRealName(list,val){
-        let name = "";
-        list.forEach(item => {
-          if (item.id == val){
-            name = item.realName
-          }
-        })
-        return name;
-      },
-      // 获取员工手机号
-      getMobile(list,val){
-        let name = "";
-        list.forEach(item => {
-          if (item.id == val){
-            name = item.mobile
-          }
-        })
-        return name;
-      },
 
-      async printLocally(data) {
-        if (!connectFlag){
-          return
-        }
-
-        //初始化打印函数
-        let LODOP = getLodop(); // 初始化打印
-        LODOP.PRINT_INIT();
-        var bodyStyle = `<style>
-            .input-box{
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                font-size: 14px;
-                margin: 5px 0px;
-              }
-             .box-ge{
-                border-bottom: 1px solid #000000 ;
-                box-sizing: border-box;
-                padding: 10px;
-              }
-              .box-title{
-                font-size: 18px;
-                text-align: center;
-                align-items: center;
-                margin-top: 15px;
-              }
-              .input-hui{
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                font-size: 14px;
-                margin: 15px 0px;
-                background: #b2b2b2;
-                box-sizing: border-box;
-                padding: 5px 0px;
-              }
-              .input-hui-frou{
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                font-size: 14px;
-                margin: 15px 0px;
-                background: #b2b2b2;
-                box-sizing: border-box;
-                padding: 5px 0px;
-                div{
-                  width: 25%;
-                  text-align: left;
-                }
-              }
-              .input-box-frou{
-                width: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                font-size: 14px;
-                margin: 5px 0px;
-                div{
-                  width: 25%;
-                  text-align: left;
-                }
-              }
-              .box-center{
-                height: 500px;
-              }
-            </style>
-            `
-        // var fromHtml = bodyStyle+this.$refs.report.innerHTML
-        var fromHtml = ''
-        if (data == 'report') {
-          fromHtml = bodyStyle+this.$refs.report.innerHTML
-        }else {
-          fromHtml = bodyStyle+this.$refs.report2.innerHTML
-
-        }
-
-
-        LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
-
-        LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
-
-        // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
-        // let preview = LODOP.PREVIEW();
-        // console.log("preview",preview);
-        LODOP.PRINT();
-
-      },
-
-      // 打印商品支付后的订单
-      oilOrderReport () {
-        let oilOrderR = []
-        this.oilInfo.forEach(order=>{
-          let o = {
-            oilName : this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
-            amount : order.orderAmount.toString(),
-            oilNum : order.oilNum.toString()
-          }
-          oilOrderR.push(o)
-        })
-        console.log("111111111111111111111111111")
-
-        let goodsOrderR = []
-        if (this.goodsInfo) {
-          this.goodsInfo.forEach(order=>{
-            console.log("111111111111111111111111111")
-
-            let o = {
-              oilName : order.name,
-              unit : order.num+""+order.unit,
-              amount : order.memberPrice.toString()
-            }
-            goodsOrderR.push(o)
-          })
-        }
-
-        console.log("111111111111111111111111112")
-
-        // 支付方式
-        const payTypeMap = {
-          'CASH': '现金',
-          'WECHAT': '微信',
-          'ALIPAY': '支付宝',
-          'UNIONPAY': '银联二维码',
-          'credit': '挂账',
-          'oilCard': '囤油卡',
-          'balance': '储值卡'
-        };
-        let payTypeText = payTypeMap[this.payType] || '小程序码';
-        console.log("111111111111111111111111113")
-
-        let f ={
-          oilOrder:oilOrderR,
-          goodsOrder:goodsOrderR,
-          payType:payTypeText,
-          amount:this.cashierOrder.amount,
-          payAmount:this.cashierOrder.amount,
-          seekZero:this.cashierOrder.payAmount
-        }
-        rePrintOilOrderReport(f).then(res=>{
-
-        })
-      },
-
-      // 补打
-      patchwork(data){
-        const orderNo = data.orderNo
-        this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() {
-          // return delUser(row.id);
-        }).then(async () => {
-          await cashierOrder(data.id).then( response => {
-            this.cashierOrder = response.data
-            this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
-          })
-          await this.getOilList(this.cashierOrder.orderNo)
-          await this.getGoodsLists(this.cashierOrder.goodsOrderId)
-          // this.printLocally('report')
-          this.oilOrderReport()
-        }).catch(() => {});
-      },
-      // 退款
-      async handleRefund(id){
-        this.dialogRefund = true;
-        await cashierOrder(id).then( response => {
-          this.cashierOrder = response.data
-
-          //
-          this.getOilList(response.data.orderNo)
-          if (response.data.status === "refund") {
-            this.$message({
-              type: 'info',
-              message: '该订单已经退款'
-            });
-            this.dialogRefund = false;
-          }
-        })
-        //退款确定
-        // this.$confirm('是否将该收银台下的订单全部退款, 是否继续?', '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // }).then(() => {
-        //   this.dialogRefund = true;
-        //   cashierOrder(id).then( response => {
-        //     this.cashierOrder = response.data
-        //     if (response.data.status === "refund") {
-        //       this.$message({
-        //         type: 'info',
-        //         message: '该订单已经退款'
-        //       });
-        //       this.dialogRefund = false;
-        //     }
-        //   })
-        // }).catch(() => {
-        //   this.$message({
-        //     type: 'info',
-        //     message: '已取消删除'
-        //   });
-        // });
-      },
-
-      // 计算退款总价
-      calculateRefunds() {
-        let refundAmt = 0
-        if (this.isGoods) {
-          refundAmt += this.cashierOrder.goodsPayAmount
-        }
-        if (this.isOil && this.cashierOrder.oilPayAmount > 0) {
-          refundAmt += this.cashierOrder.oilPayAmount
-        }
-
-        this.calculateRefundsV = refundAmt;
-      },
-
-      async refundConfirmed() {
-        this.calculateRefunds();
-        if(!this.isOil && !this.isGoods) {
-          this.$message({
-            type: 'info',
-            message: '请选择退款项'
-          });
-          return
-        }
-        this.dialogRefund = false;
-        this.loading = true;
-        console.log("cashierOrder",this.cashierOrder)
-
-
-
-        // 计算退款总价
-        let refundAmt = 0
-        if (this.isGoods) {
-          refundAmt += this.cashierOrder.goodsPayAmount
-        }
-        if (this.isOil && this.cashierOrder.oilPayAmount > 0) {
-          refundAmt += this.cashierOrder.oilPayAmount
-        }
-
-        // if (this.isOilCard || this.isOilFuel) {
-        //   this.isOil = true
-        // }
-
-        let map={
-
-          orderNo: this.cashierOrder.orderNo,
-          storeId: this.cashierOrder.storeId,
-          refundRemark:this.radio1 +"-"+ this.refundRemark,
-          type: "canRefund",
-          isOilVouchers:this.isOilVouchers,
-          isGoods: this.isGoods,
-          isOil: this.isOil,
-          isOilCard: this.isOilCard,  // 是否推掉油卡
-          isOilFuel: this.isOilFuel, //是否推掉储值卡
-          refundAmt: refundAmt
-        }
-        await refundApi(map).then(res=>{
-          if(res.code == 200) {
-            this.$message({
-              type: 'info',
-              message: '退款成功'
-            });
-            // this.printLocally()
-            this.oilOrderReport()
-          }
-
-        })
-
-        this.loading = false;
-
-        this.getList();
-        // this.getOrderStatistics();
-        this.getStaffList();
-
-      },
-      // 获取油枪信息
-      getOilGunList(){
-        getOilNumberGun().then(res => {
-          res.data.forEach(item => {
-            if (item.oilGunList.length>0){
-              item.oilGunList.forEach(i => {
-                i.oilName = item.oilName
-                this.oilGunList.push(i)
-              })
-            }
-          })
-        })
-      },
-      // 获取油枪名称
-      getName1(oilNameList,id){
-        let name = ""
-        let _this = this;
-        if(oilNameList!=null && oilNameList!=""){
-          oilNameList.forEach(item => {
-            if (item.id == id){
-              name = item.gunName;
-            }
-          })
-        }
-        return name;
-      },
-      // 获取油号名称
-      getName(oilNameList,id){
-        let name = ""
-        let _this = this;
-        if(oilNameList!=null && oilNameList!=""){
-          oilNameList.forEach(item => {
-            if (item.id == id){
-              name = item.oilName;
-              _this.oilType = item.oilType;
-            }
-          })
-        }
-        return name;
-      },
-      // 获取订单详情
-      getOrdersInfo(id){
-        cashierOrder(id).then( response => {
-          this.cashierOrder = response.data
-          this.getOilList(this.cashierOrder.orderNo)
-          this.getGoodsLists(this.cashierOrder.goodsOrderId)
-          this.dialogVisible = true;
-        })
-      },
-      async getOilList(orderNo){
-        await oilOrderList({orderNo:orderNo}).then( response => {
-          this.oilInfo = response.data
-        })
-      },
-      async getGoodsLists(id){
-        await getOrderGoods({orderId:id}).then( response => {
-          this.goodsInfo = response.data;
-        })
-      },
-      parseTime1(dateTime) {
-        let date = new Date(dateTime);
-        let y = date.getFullYear() + "-";
-        let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-";
-        let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " ";
-        let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
-        let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
-        let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
-        // return new Date(y , mon , d , h , m , s);
-        return y+mon+d+h+m+s;
-      },
       // 获取列表信息
       getList(val){
-        if (val!=undefined){
-          this.queryParams.page = val
-        }
 
-        let dateRange1 = this.dateRange
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // if (this.isSysDate){
-        //   dateRange.push(dateRange1[0].toLocaleDateString())
-        //   dateRange.push(dateRange1[1].toLocaleDateString())
-        // }else {
-        //   dateRange = this.dateRange
-        // }
-
-        listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
+        getInstituionListApi(this.addDateRange(this.queryParams)).then( response => {
           this.orderList = response.data.records;
           this.total = response.data.total;
           this.isSysDate = false
         })
-        this.getSeekZero(val)
         this.getOrderStatistics()
       },
-      getSeekZero(val){
-        if (val!=undefined){
-          this.queryParams.page = val
-        }
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, dateRange)).then( response => {
-          if (response.data) {
-            this.seekZeroAmount = response.data
-          }
-        })
-      },
-      // 获取员工列表信息
-      getStaffList(){
-        queryStaffs().then( response => {
-          this.staffList = response.data;
-        })
-        getOilNameList().then( response => {
-          this.oilNameList = response.data;
-        })
-      },
+
+        getDeptList() {
+          getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
+            this.deptList = response.data.records;
+          })
+        },
+
       // 搜索按钮操作
       handleQuery() {
         this.queryParams.page = 1;
@@ -1053,7 +245,6 @@ import {rePrintOilOrderReport} from "@/api/print";
         }
         this.beginTime = ""
         this.endTime = ""
-        // this.resetForm("queryForm");
         this.handleQuery();
       },
     }
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue
index 6c69767a8..87b3880d6 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue
@@ -1,135 +1,31 @@
 <!-- 收银台订单-->
 <template>
   <div style="margin-top: 30px">
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
-      <div class="box-gang">
-        <div class="box">
-          <div class="size-hui">交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">笔单价</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-        <div class="box">
-          <div class="size-hui">日均交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
-        </div>
-      </div>
-    </el-card>
     <el-card class="box-card">
       <div class="wgang">
         <div>机构流水分析列表</div>
-        <div style="display: flex ">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
-            <el-form-item label="交易时间：">
-              <!--          <el-date-picker-->
-              <!--            v-model="dateRange"-->
-              <!--            style="width: 400px"-->
-              <!--            size="medium"-->
-              <!--            value-format="yyyy-MM-dd"-->
-              <!--            type="datetimerange"-->
-              <!--            range-separator="至"-->
-              <!--            start-placeholder="开始日期"-->
-              <!--            end-placeholder="结束日期"-->
-              <!--          ></el-date-picker>-->
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 140px"
-                type="date"
-                placeholder="开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="endTime"
-                style="width: 140px"
-                type="date"
-                placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="机构：" prop="staffId">
-              <el-select
-                v-model="queryParams.staffId"
-                clearable
-                placeholder="全部"
-              >
-                <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-                  <span style="float: left">{{ item.realName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
-
-            </el-form-item>
-          </el-form>
         </div>
-      </div>
       <div class="table-box">
         <el-table
           :data="orderList"
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
-          </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-          </el-table-column>
-
-
+          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>
+          <el-table-column prop="deptName" align="center" label="门店名称"> </el-table-column>
+<!--          <el-table-column prop="seekZero" align="center" label="门店省市"> </el-table-column>-->
+          <el-table-column prop="leaderName" align="center" label="联系人"> </el-table-column>
+          <el-table-column prop="leaderPhone" align="center" label="联系电话"> </el-table-column>
+          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>
+          <el-table-column prop="parentStoreName" align="center" label="机构名称"> </el-table-column>
+<!--          <el-table-column prop="leaderName" align="center" label="业务员"> </el-table-column>-->
+<!--          <el-table-column prop="leaderPhone" align="center" label="业务员联系电话"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="省"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="市"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="区"> </el-table-column>-->
+          <el-table-column prop="addr" align="center" label="地址"> </el-table-column>
+          <el-table-column prop="createTime" align="center" label="创建日期"> </el-table-column>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -150,8 +46,10 @@
 
 <script>
 
+  import {getNoneListApi} from "@/api/allOrder";
+
   export default {
-    name: "runningWater-institution",
+    name: "runningWater-none",
     data(){
       return{
         radio1:"油号选错",
@@ -210,28 +108,14 @@
         //   this.$download.saveAs(blob,'收银台订单统计.xLsx')
         // })
       },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   this.orderStatistics = res.data
-        // })
-      },
 
       // 获取列表信息
       getList(val){
-
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
-        this.getOrderStatistics()
+        getNoneListApi(this.addDateRange(this.queryParams)).then( response => {
+          this.orderList = response.data.records;
+          this.total = response.data.total;
+          this.isSysDate = false
+        })
       },
 
       // 搜索按钮操作
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
index 6c69767a8..0503d8873 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
@@ -4,27 +4,31 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>收银台订单统计</span>
-      </div>交易金额，交易笔数，笔单价，日均交易金额，日均交易笔数
+      </div>
       <div class="box-gang">
         <div class="box">
           <div class="size-hui">交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-bole">{{ orderStatistics.amount }}</div>
         </div>
         <div class="box">
           <div class="size-hui">交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-bole">{{ orderStatistics.strokeCount }}</div>
         </div>
         <div class="box">
           <div class="size-hui">笔单价</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-bole">{{ orderStatistics.unitPrice }}</div>
         </div>
         <div class="box">
           <div class="size-hui">日均交易金额</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-bole">{{ orderStatistics.dailyAmount }}</div>
         </div>
         <div class="box">
           <div class="size-hui">日均交易笔数</div>
-          <div class="size-bole">{{ 0 }}</div>
+          <div class="size-bole">{{ orderStatistics.strokesPerDay }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">活跃机构数</div>
+          <div class="size-bole">{{ orderStatistics.inertiaStore }}</div>
         </div>
       </div>
     </el-card>
@@ -85,51 +89,19 @@
           :data="orderList"
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
-          </el-table-column>
-          <el-table-column label="操作人" align="center" prop="staffId">
-          </el-table-column>
-
-
+          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>
+          <el-table-column prop="deptName" align="center" label="门店名称"> </el-table-column>
+          <el-table-column prop="addr" align="center" label="门店省市"> </el-table-column>
+          <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
+          <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
+          <el-table-column prop="unitPrice" align="center" label="笔单价"> </el-table-column>
+          <el-table-column prop="dailyAmount" align="center" label="日均交易金额"> </el-table-column>
+          <el-table-column prop="strokesPerDay" align="center" label="日均交易笔数"> </el-table-column>
+          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>
+          <el-table-column prop="parentStoreName" align="center" label="机构名称"> </el-table-column>
+          <el-table-column prop="leaderName" align="center" label="站长"> </el-table-column>
+<!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
+<!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
         </el-table>
       </div>
       <div class="pagination-box">
@@ -150,11 +122,12 @@
 
 <script>
 
+import {getInstituionListApi, getRunningWaterByDataApi} from "@/api/allOrder";
+
   export default {
-    name: "runningWater-institution",
+    name: "runningWater-oilDepot",
     data(){
       return{
-        radio1:"油号选错",
         loading:false,
         // 员工列表
         staffList:[],
@@ -172,6 +145,8 @@
           pageSize: 10,
           beginTime:"",
           endTime:"",
+          deptType:"3",
+
         },
         orderStatistics:{
           numberOfStrokes:'0',
@@ -218,19 +193,19 @@
           dateRange.push(this.beginTime.toLocaleDateString())
           dateRange.push(this.endTime.toLocaleDateString())
         }
-        // orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-        //   this.orderStatistics = res.data
-        // })
+        getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+          this.orderStatistics = res.data
+        })
       },
 
       // 获取列表信息
       getList(val){
 
-        // listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-        //   this.orderList = response.data.records;
-        //   this.total = response.data.total;
-        //   this.isSysDate = false
-        // })
+        getInstituionListApi(this.addDateRange(this.queryParams)).then( response => {
+          this.orderList = response.data.records;
+          this.total = response.data.total;
+          this.isSysDate = false
+        })
         this.getOrderStatistics()
       },
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index 478638bcd..e00eaedc3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -2,6 +2,7 @@ package com.fuint.business.order.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.dto.AllOrderInfoDto;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.entity.CardBalanceChange;
 import com.fuint.business.order.service.AllOrderInfoService;
@@ -9,9 +10,11 @@ import com.fuint.business.order.vo.AllOrderInfoVo;
 import com.fuint.business.order.vo.CardBalanceChangeVo;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
+import com.fuint.system.dept.vo.SysDeptVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -76,4 +79,77 @@ public class AllOrderInfoController extends BaseController {
     public ResponseObject getOrderInfo(String orderNo, String type) {
         return getSuccessResult(allOrderInfoService.getOrderInfo(orderNo,type));
     }
+
+
+    /**
+     * 交易对账
+     * 交易明细分页查询
+     */
+    @GetMapping("trading")
+    public ResponseObject getTradingPage(AllOrderInfoDto allOrderInfo,
+                                      @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                      @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<AllOrderInfoVo> list = allOrderInfoService.getTradingPage(page, allOrderInfo);
+        return getSuccessResult(list);
+    }
+
+    @GetMapping("getTradingData")
+    public ResponseObject getTradingData(AllOrderInfoDto allOrderInfo,
+                                      @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                      @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        AllOrderInfoVo list = allOrderInfoService.getTradingData(allOrderInfo);
+        return getSuccessResult(list);
+    }
+
+    /**
+     * 机构流水分析
+     */
+    @GetMapping("runningWaterByInstituion")
+    public ResponseObject runningWaterByInstituion(AllOrderInfoDto allOrderInfoDto,
+                             @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                             @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<SysDeptVo> list = allOrderInfoService.runningWaterByInstituion(page, allOrderInfoDto);
+        return getSuccessResult(list);
+    }
+
+    /**
+     * 机构流水分析
+     */
+    @GetMapping("runningWaterByNone")
+    public ResponseObject runningWaterByNone(AllOrderInfoDto allOrderInfoDto,
+                             @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                             @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<SysDeptVo> list = allOrderInfoService.runningWaterByNone(page, allOrderInfoDto);
+        return getSuccessResult(list);
+    }
+
+    @GetMapping("runningWaterByDay")
+    public ResponseObject runningWaterByDay(AllOrderInfoDto allOrderInfoDto,
+                                                   @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<AllOrderInfoVo> list = allOrderInfoService.runningWaterByDay(page, allOrderInfoDto);
+        return getSuccessResult(list);
+    }
+    @GetMapping("runningWaterByData")
+    public ResponseObject runningWaterByData(AllOrderInfoDto allOrderInfoDto,
+                                                   @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,100000);
+        AllOrderInfoVo list = allOrderInfoService.runningWaterByData(page, allOrderInfoDto);
+        return getSuccessResult(list);
+    }
+
+    @GetMapping("runningWaterByTissue")
+    public ResponseObject runningWaterByTissue(AllOrderInfoDto allOrderInfoDto,
+                                                   @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,100000);
+        IPage<SysDeptVo> list = allOrderInfoService.runningWaterByTissue(page, allOrderInfoDto);
+        return getSuccessResult(list);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java
new file mode 100644
index 000000000..f75811277
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java
@@ -0,0 +1,13 @@
+package com.fuint.business.order.dto;
+
+import com.fuint.business.order.entity.AllOrderInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AllOrderInfoDto extends AllOrderInfo {
+    private String deptType; //节点类型:1代理商2连锁店3基本门店4三方机构
+    private Long deptId; //节点类型:1代理商2连锁店3基本门店4三方机构
+    private List<Long> storeIds;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
index a8d85eec2..48a76367e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.dto.AllOrderInfoDto;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.entity.CardBalanceChange;
 import com.fuint.business.order.vo.AllOrderInfoVo;
@@ -20,4 +21,19 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
     String sumPayMoney( @Param("allOrderInfo") AllOrderInfo allOrderInfo);
     // 根据storeId List查询总流水
     BigDecimal allStream(@Param("list") List<MtStore> mtStoreList);
+    AllOrderInfoVo getTradingData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+    IPage<AllOrderInfoVo> getTradingPage(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
+
+    IPage<AllOrderInfoVo> getTradingPage(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+    AllOrderInfoVo getRunningWaterByInstituion(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+
+
+//    计算不活跃的店铺数量
+    AllOrderInfoVo getStoreNDynamic(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+
+    IPage<AllOrderInfoVo> getRunningWaterByDay(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+    AllOrderInfoVo getRunningWaterByData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+
+
+
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index 4772a6536..db307775f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -13,7 +13,7 @@
                 </foreach>
         </where>
     </select>
-    <select id="getPageList" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+    <select id="getTradingPage" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
         select
             aoi.id AS id,
             aoi.order_no AS orderNo,
@@ -26,37 +26,107 @@
             aoi.pay_type AS payType,
             aoi.user_id AS userId,
             aoi.pay_channel AS payChannel,
-            aoi.status AS orderStatus,
+            aoi.status AS status,
             aoi.content AS orderContent,
             aoi.create_time AS createTime,
             aoi.create_by AS createBy,
             aoi.update_time AS updateTime,
             aoi.update_by AS updateBy,
+            aoi.reason_Refund AS reasonRefund,
+            aoi.ref_order_no AS refOrderNo,
+            aoi.ref_money AS refMoney,
+            aoi.ref_by AS refBy,
             mu.name userName,
             mu.mobile userMobile
         from all_order_info aoi
         left join mt_user mu ON aoi.user_id = mu.id
-        where aoi.store_id = #{allOrderInfo.storeId}
-        <if test="allOrderInfo.type != null and allOrderInfo.type != ''">
-            and aoi.type = #{allOrderInfo.type}
-        </if>
-        <if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
-            and aoi.order_no = #{allOrderInfo.orderNo}
-        </if>
-        <if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
-            and aoi.pay_channel = #{allOrderInfo.payChannel}
-        </if>
-        <if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
-            and aoi.pay_type = #{allOrderInfo.payType}
-        </if>
-        <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
-            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
-        </if>
-        <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
-            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
-        </if>
+        <where>
+
+            <if test="allOrderInfo.type != null and allOrderInfo.type != ''">
+                and aoi.type = #{allOrderInfo.type}
+            </if>
+            <if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
+                and order_no like concat('%', #{allOrderInfo.orderNo}, '%')
+            </if>
+            <if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
+                and aoi.pay_channel = #{allOrderInfo.payChannel}
+            </if>
+            <if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
+                and aoi.pay_type = #{allOrderInfo.payType}
+            </if>
+                <if test="allOrderInfo.status != null and allOrderInfo.status != ''">
+                and aoi.status = #{allOrderInfo.status}
+            </if>
+            <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.storeIds != null">
+                and aoi.store_id in
+                <foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
         order by aoi.create_time desc
     </select>
+
+    <select id="getRunningWaterByInstituion" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        select
+        COALESCE(SUM(pay_money), 0) AS amount,
+        COALESCE(COUNT(*), 0) AS strokeCount,
+        CASE
+            WHEN COUNT(*) = 0 THEN 0
+            ELSE SUM(pay_money) / COUNT(*)
+        END AS unitPrice
+
+        from all_order_info aoi
+        <where>
+            <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.storeIds != null">
+                and aoi.store_id in
+                <foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+<!--    sum(pay_money) amount,-->
+<!--    count(*) strokeCount,-->
+<!--    SUM(pay_money) / COUNT(*) AS unitPrice,-->
+<!--    store_id storeId,-->
+    <select id="getStoreNDynamic" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        select
+        COUNT(DISTINCT aoi.store_id) AS storeCount
+        from all_order_info aoi
+        <where>
+            <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.storeIds != null">
+                and aoi.store_id in
+                <foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND aoi.pay_money &gt; 0
+        </where>
+    </select>
+
+
+<!--    &#45;&#45;         aoi.store_id = #{allOrderInfo.storeId}-->
     <select id="sumPayMoney" resultType="java.lang.String">
         select
             sum(aoi.pay_money) sumPayMoney
@@ -82,4 +152,145 @@
             and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
         </if>
     </select>
+
+
+
+    <select id="getPageList" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        select
+        aoi.id AS id,
+        aoi.order_no AS orderNo,
+        aoi.type AS type,
+        aoi.transaction_id AS transactionId,
+        aoi.store_id AS storeId,
+        aoi.goods_money AS goodsMoney,
+        aoi.pay_money AS payMoney,
+        aoi.pay_time AS payTime,
+        aoi.pay_type AS payType,
+        aoi.user_id AS userId,
+        aoi.pay_channel AS payChannel,
+        aoi.status AS orderStatus,
+        aoi.content AS orderContent,
+        aoi.create_time AS createTime,
+        aoi.create_by AS createBy,
+        aoi.update_time AS updateTime,
+        aoi.update_by AS updateBy,
+        mu.name userName,
+        mu.mobile userMobile
+        from all_order_info aoi
+        left join mt_user mu ON aoi.user_id = mu.id
+        where aoi.store_id = #{allOrderInfo.storeId}
+        <if test="allOrderInfo.type != null and allOrderInfo.type != ''">
+            and aoi.type = #{allOrderInfo.type}
+        </if>
+        <if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
+            and aoi.order_no = #{allOrderInfo.orderNo}
+        </if>
+        <if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
+            and aoi.pay_channel = #{allOrderInfo.payChannel}
+        </if>
+        <if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
+            and aoi.pay_type = #{allOrderInfo.payType}
+        </if>
+        <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+        </if>
+        <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+        </if>
+        order by aoi.create_time desc
+    </select>
+    <select id="getRunningWaterByDay" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        SELECT DATE(pay_time) AS pay_time,
+               COUNT(DISTINCT aoi.store_id) storeCount,
+               COALESCE(SUM(pay_money), 0) AS amount,
+               COALESCE(COUNT(*), 0) AS strokeCount,
+               ROUND(
+                       CASE
+                           WHEN COUNT(*) = 0 THEN 0
+                           ELSE SUM(pay_money) / COUNT(*)
+                           END,
+                       2
+               ) AS unitPrice
+        from all_order_info aoi
+        WHERE date_format(aoi.pay_time,'%y%m%d') BETWEEN date_format(#{allOrderInfo.params.beginTime},'%y%m%d') AND date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+        GROUP BY date_format(aoi.pay_time,'%y%m%d')
+        HAVING
+            amount > 0
+        Order by aoi.pay_time
+    </select>
+    <select id="getRunningWaterByData" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        select
+        COUNT(DISTINCT aoi.store_id) storeCount,
+        COALESCE(SUM(pay_money), 0) AS amount,
+        COALESCE(COUNT(*), 0) AS strokeCount,
+        ROUND(
+            CASE
+                WHEN COUNT(*) = 0 THEN 0
+                ELSE SUM(pay_money) / COUNT(*)
+                END,
+            2
+        ) AS unitPrice
+        from all_order_info aoi
+        <where>
+            <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.storeIds != null">
+                and aoi.store_id in
+                <foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND aoi.pay_money &gt; 1
+        </where>
+    </select>
+    <select id="getTradingData" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        select
+        SUM(CASE WHEN pay_type = 'CASH' THEN pay_money ELSE 0 END) AS CASH,
+        SUM(CASE WHEN pay_type = 'WECHAT' THEN pay_money ELSE 0 END) AS WECHAT,
+        SUM(CASE WHEN pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) AS ALIPAY,
+        SUM(CASE WHEN pay_type = 'balance' THEN pay_money ELSE 0 END) AS balance,
+        COUNT(CASE WHEN pay_type = 'CASH' THEN 0 END) AS CASHCount,
+        COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS WECHATCount,
+        COUNT(CASE WHEN pay_type = 'ALIPAY' THEN 0 END) AS ALIPAYCount,
+        COUNT(CASE WHEN pay_type = 'balance' THEN 0 END) AS balanceCount,
+        SUM(CASE WHEN aoi.status  = 'refunt' THEN pay_money ELSE 0 END) AS refBalance,
+        COUNT(CASE WHEN aoi.status  = 'refunt' THEN 0 END) AS refBalanceCount
+
+        from all_order_info aoi
+        left join mt_user mu ON aoi.user_id = mu.id
+        <where>
+
+            <if test="allOrderInfo.type != null and allOrderInfo.type != ''">
+                and aoi.type = #{allOrderInfo.type}
+            </if>
+            <if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
+                and order_no like concat('%', #{allOrderInfo.orderNo}, '%')
+            </if>
+            <if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
+                and aoi.pay_channel = #{allOrderInfo.payChannel}
+            </if>
+            <if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
+                and aoi.pay_type = #{allOrderInfo.payType}
+            </if>
+            <if test="allOrderInfo.status != null and allOrderInfo.status != ''">
+                and aoi.status = #{allOrderInfo.status}
+            </if>
+            <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.storeIds != null">
+                and aoi.store_id in
+                <foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
index c0f3a2220..c4df16153 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
@@ -2,9 +2,12 @@ package com.fuint.business.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.dto.AllOrderInfoDto;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.vo.AllOrderInfoVo;
 import com.fuint.business.order.vo.CardBalanceChangeVo;
+import com.fuint.framework.exception.BusinessCheckException;
+import com.fuint.system.dept.vo.SysDeptVo;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
@@ -63,5 +66,13 @@ public interface AllOrderInfoService {
 
     Map<String,String> getOrderInfo(String orderNo, String type);
 
+    AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo);
+    IPage<AllOrderInfoVo> getTradingPage(Page page, AllOrderInfoDto allOrderInfo);
+    IPage<SysDeptVo> runningWaterByInstituion(Page page, AllOrderInfoDto allOrderInfo);
+    IPage<SysDeptVo> runningWaterByNone(Page page, AllOrderInfoDto allOrderInfo);
+    IPage<AllOrderInfoVo> runningWaterByDay(Page page, AllOrderInfoDto allOrderInfo);
+
+    AllOrderInfoVo runningWaterByData(Page page, AllOrderInfoDto allOrderInfo);
+    IPage<SysDeptVo> runningWaterByTissue(Page page, AllOrderInfoDto allOrderInfo);
 
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 27241f90b..27e84274b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -18,6 +18,7 @@ import com.fuint.business.convenienceSore.entity.StockTrack;
 import com.fuint.business.convenienceSore.service.LJGoodsService;
 import com.fuint.business.convenienceSore.service.StockTrackService;
 import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService;
+import com.fuint.business.order.dto.AllOrderInfoDto;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.entity.LJOrder;
@@ -31,12 +32,25 @@ import com.fuint.business.petrolStationManagement.entity.OilTracking;
 import com.fuint.business.petrolStationManagement.service.OilGunService;
 import com.fuint.business.petrolStationManagement.service.OilTankService;
 import com.fuint.business.petrolStationManagement.service.OilTrackingService;
+import com.fuint.business.store.entity.MtStore;
+import com.fuint.business.store.service.StoreService;
 import com.fuint.business.userManager.service.UserBalanceService;
 import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.service.MemberService;
+import com.fuint.common.service.StaffService;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.repository.mapper.MtOpenGiftMapper;
+import com.fuint.repository.mapper.MtUserMapper;
 import com.fuint.repository.model.MtOrderGoods;
+import com.fuint.repository.model.MtStaff;
+import com.fuint.repository.model.MtUser;
+import com.fuint.system.dept.entity.SysDept;
+import com.fuint.system.dept.mapper.SysDeptMapper;
+import com.fuint.system.dept.service.ISysDeptService;
+import com.fuint.system.dept.vo.SysDeptVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,10 +59,12 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -303,6 +319,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
     @Resource
     CardFavorableRecordService cardFavorableRecordService;
 
+    @Resource
+    StoreService storeService;
+
     // 处理油品
     private void disposeOil(OilOrder oilOrder,Map<String, String> map) {
 
@@ -401,4 +420,319 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         return res;
     }
 
+    @Resource
+    StaffService staffService;
+    @Resource
+    MemberService memberService;
+    @Resource
+    private MtUserMapper mtUserMapper;
+
+
+    public AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo) {
+        return allOrderInfoMapper.getTradingData(allOrderInfo);
+    }
+
+    @Override
+    public IPage<AllOrderInfoVo> getTradingPage(Page page, AllOrderInfoDto allOrderInfo) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+
+//        IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
+//
+//        allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
+//
+
+
+        IPage<AllOrderInfoVo> pageList = allOrderInfoMapper.getTradingPage(page, allOrderInfo);
+        for (AllOrderInfoVo record : pageList.getRecords()) {
+            MtStore mtStore = storeService.queryStoreById3(record.getStoreId());
+            MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(record.getStoreId());
+            record.setStoreName(mtStore.getName());
+            if(ObjectUtil.isNotEmpty(merchantConfig)) {
+                record.setMchntCd(merchantConfig.getMchntCd());
+            }else {
+                record.setMchntCd("--");
+            }
+            // 收银员
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getCreateBy())) {
+                MtStaff mtStaff = staffService.queryStaffById2(Integer.parseInt(allOrderInfo.getCreateBy()));
+                if(ObjectUtil.isNotEmpty(mtStaff)) {
+                    record.setCreateBy(mtStaff.getRealName());
+                }else {
+                    record.setCreateBy("--");
+
+                }
+            }
+
+            MtUser byId = mtUserMapper.queryMemberById(allOrderInfo.getUserId());
+            if(ObjectUtil.isNotEmpty(byId)) {
+                record.setUserName(byId.getName());
+            }else {
+                record.setUserName("--");
+            }
+
+        }
+        return pageList;
+    }
+
+
+    @Resource
+    ISysDeptService iSysDeptService;
+    @Resource
+    SysDeptMapper sysDeptMapper;
+    @Override
+    public IPage<SysDeptVo> runningWaterByInstituion(Page page, AllOrderInfoDto allOrderInfo) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+
+        IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
+
+        for (SysDeptVo sysDept : sysDepts.getRecords()) {
+            long dayNum = 0;
+            // 查询父级
+            SysDept sysDept1 = sysDeptMapper.selectDeptById(sysDept.getParentId());
+            sysDept.setParentStoreId(sysDept.getParentId());
+            sysDept.setParentStoreName(sysDept1.getParentName());
+            //计算天数
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
+                String beginTimeStr = allOrderInfo.getParams().get("beginTime").toString();
+                String endTimeStr =  allOrderInfo.getParams().get("endTime").toString();
+                dayNum = dayCount(beginTimeStr, endTimeStr);
+
+            } else {
+                LocalDate createDate = sysDept.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                dayNum = dayCount2(createDate);
+
+            }
+            if (dayNum<1) {
+                dayNum = 1;
+            }
+            List<SysDeptVo> store = new ArrayList<>();
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getDeptType()) && "3".equals(allOrderInfo.getDeptType())) {
+                SysDeptVo storeByDept = sysDeptMapper.getStoreByDept(sysDept.getDeptId());
+                sysDept.setAddr(storeByDept.getAddr());
+                store.add(storeByDept);
+            }else {
+                store = sysDeptMapper.selectChildrenDeptByIdStore(sysDept.getDeptId());
+            }
+
+            if (ObjectUtil.isNotEmpty(store)){
+                allOrderInfo.setStoreIds(store.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
+            }else {
+                continue;
+            }
+
+            AllOrderInfoVo runningWaterByInstituion = allOrderInfoMapper.getRunningWaterByInstituion(allOrderInfo);
+            sysDept.setAmount(runningWaterByInstituion.getAmount());
+            sysDept.setStrokeCount(runningWaterByInstituion.getStrokeCount());
+            sysDept.setUnitPrice(runningWaterByInstituion.getUnitPrice());
+
+            calculatedMean(sysDept,dayNum);
+
+            //查询不活跃
+            AllOrderInfoVo storeNDynamic = allOrderInfoMapper.getStoreNDynamic(allOrderInfo);
+            sysDept.setInertiaStore(storeNDynamic.getStoreCount());
+        }
+        return sysDepts;
+    }
+
+    @Override
+    public IPage<SysDeptVo> runningWaterByNone(Page page, AllOrderInfoDto allOrderInfo) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        allOrderInfo.setDeptType("3");
+        IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
+        List<SysDeptVo> sysDeptVos = new ArrayList<>();
+        for (SysDeptVo sysDept : sysDepts.getRecords()) {
+            long dayNum = 0;
+            // 查询父级
+            SysDept sysDept1 = sysDeptMapper.selectDeptById(sysDept.getParentId());
+            sysDept.setParentStoreId(sysDept.getParentId());
+            sysDept.setParentStoreName(sysDept1.getParentName());
+            //计算天数
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
+                String beginTimeStr = allOrderInfo.getParams().get("beginTime").toString();
+                String endTimeStr = allOrderInfo.getParams().get("endTime").toString();
+                dayNum = dayCount(beginTimeStr, endTimeStr);
+
+            } else {
+                LocalDate createDate = sysDept.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                dayNum = dayCount2(createDate);
+
+            }
+            if (dayNum<1) {
+                dayNum = 1;
+            }
+            List<SysDeptVo> store = new ArrayList<>();
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getDeptType()) && "3".equals(allOrderInfo.getDeptType())) {
+                SysDeptVo storeByDept = sysDeptMapper.getStoreByDept(sysDept.getDeptId());
+                sysDept.setAddr(storeByDept.getAddr());
+                store.add(storeByDept);
+            }else {
+                store = sysDeptMapper.selectChildrenDeptByIdStore(sysDept.getDeptId());
+            }
+
+            if (ObjectUtil.isNotEmpty(store)){
+                allOrderInfo.setStoreIds(store.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
+            }else {
+                continue;
+            }
+
+            AllOrderInfoVo runningWaterByInstituion = allOrderInfoMapper.getRunningWaterByInstituion(allOrderInfo);
+            sysDept.setAmount(runningWaterByInstituion.getAmount());
+            sysDept.setStrokeCount(runningWaterByInstituion.getStrokeCount());
+            sysDept.setUnitPrice(runningWaterByInstituion.getUnitPrice());
+
+            calculatedMean(sysDept,dayNum);
+
+            //查询不活跃
+            AllOrderInfoVo storeNDynamic = allOrderInfoMapper.getStoreNDynamic(allOrderInfo);
+            sysDept.setInertiaStore(storeNDynamic.getStoreCount());
+
+            if (Double.parseDouble(runningWaterByInstituion.getAmount()) <= 0.00) {
+                sysDeptVos.add(sysDept);
+            }
+        }
+        sysDepts.setRecords(sysDeptVos);
+        return sysDepts;
+    }
+
+    public IPage<AllOrderInfoVo> runningWaterByDay(Page page, AllOrderInfoDto allOrderInfo) {
+        //计算天数
+        if (!ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
+            throw new RuntimeException("");
+        }
+
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        allOrderInfo.setDeptType("3");
+        List<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId());
+        allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
+
+        // 数据查询
+        IPage<AllOrderInfoVo> runningWaterByDay = allOrderInfoMapper.getRunningWaterByDay(page,allOrderInfo);
+
+
+        return runningWaterByDay;
+    }
+
+
+    @Override
+    public AllOrderInfoVo runningWaterByData(Page page, AllOrderInfoDto allOrderInfo){
+        AllOrderInfoVo allOrderInfoVo = new AllOrderInfoVo();
+        allOrderInfoVo.setAmount("0");
+        allOrderInfoVo.setStrokeCount("0");
+        allOrderInfoVo.setUnitPrice("0");
+        allOrderInfoVo.setDailyAmount("0");
+        allOrderInfoVo.setStrokesPerDay("0");
+        allOrderInfoVo.setStoreCount("0");
+        allOrderInfoVo.setInertiaStore("0");
+
+        //流水数据分析
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
+
+        for (SysDeptVo sysDept : sysDepts.getRecords()) {
+            long dayNum = 0;
+            // 查询父级
+            SysDept sysDept1 = sysDeptMapper.selectDeptById(sysDept.getParentId());
+            sysDept.setParentStoreId(sysDept.getParentId());
+            sysDept.setParentStoreName(sysDept1.getParentName());
+            //计算天数
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
+                String beginTimeStr = allOrderInfo.getParams().get("beginTime").toString();
+                String endTimeStr =  allOrderInfo.getParams().get("endTime").toString();
+                dayNum = dayCount(beginTimeStr, endTimeStr);
+
+            } else {
+                LocalDate createDate = sysDept.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                dayNum = dayCount2(createDate);
+
+            }
+            if (dayNum<1) {
+                dayNum = 1;
+            }
+            List<SysDeptVo> store = new ArrayList<>();
+            if (ObjectUtil.isNotEmpty(allOrderInfo.getDeptType()) && "3".equals(allOrderInfo.getDeptType())) {
+                SysDeptVo storeByDept = sysDeptMapper.getStoreByDept(sysDept.getDeptId());
+                sysDept.setAddr(storeByDept.getAddr());
+                store.add(storeByDept);
+            }else {
+                store = sysDeptMapper.selectChildrenDeptByIdStore(sysDept.getDeptId());
+            }
+
+            if (ObjectUtil.isNotEmpty(store)){
+                allOrderInfo.setStoreIds(store.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
+            }else {
+                continue;
+            }
+
+            AllOrderInfoVo runningWaterByInstituion = allOrderInfoMapper.getRunningWaterByInstituion(allOrderInfo);
+            sysDept.setAmount(runningWaterByInstituion.getAmount());
+            sysDept.setStrokeCount(runningWaterByInstituion.getStrokeCount());
+            sysDept.setUnitPrice(ObjectUtil.isNotEmpty(runningWaterByInstituion.getUnitPrice())?runningWaterByInstituion.getUnitPrice():"0");
+
+            calculatedMean(sysDept,dayNum);
+
+            //查询不活跃
+            AllOrderInfoVo storeNDynamic = allOrderInfoMapper.getStoreNDynamic(allOrderInfo);
+            sysDept.setInertiaStore(storeNDynamic.getStoreCount());
+
+            Double amount = Double.parseDouble(allOrderInfoVo.getAmount()) + Double.parseDouble(sysDept.getAmount());
+            Double strokeCount = Double.parseDouble(allOrderInfoVo.getStrokeCount()) + Double.parseDouble(sysDept.getStrokeCount());
+            Double unitPrice = Double.parseDouble(allOrderInfoVo.getUnitPrice()) + Double.parseDouble(sysDept.getUnitPrice());
+            Double dailyAmount = Double.parseDouble(allOrderInfoVo.getDailyAmount()) + Double.parseDouble(sysDept.getDailyAmount());
+            Double strokesPerDay = Double.parseDouble(allOrderInfoVo.getStrokesPerDay()) + Double.parseDouble(sysDept.getStrokesPerDay());
+            Integer inertiaStore = Integer.parseInt(allOrderInfoVo.getInertiaStore()) + Integer.parseInt(sysDept.getInertiaStore());
+            allOrderInfoVo.setAmount(amount.toString());
+            allOrderInfoVo.setStrokeCount(strokeCount.toString());
+            allOrderInfoVo.setUnitPrice(unitPrice.toString());
+            allOrderInfoVo.setDailyAmount(dailyAmount.toString());
+            allOrderInfoVo.setStrokesPerDay(strokesPerDay.toString());
+            allOrderInfoVo.setInertiaStore(inertiaStore.toString());
+
+
+        }
+        return allOrderInfoVo;
+
+    }
+
+    // 组织查询
+    @Override
+    public IPage<SysDeptVo> runningWaterByTissue(Page page, AllOrderInfoDto allOrderInfo) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(), allOrderInfo.getDeptType());
+        return sysDepts;
+    }
+    private long dayCount(String beginTimeStr, String endTimeStr ) {
+        // 将字符串表示的时间转换成 LocalDate 对象
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
+        LocalDate beginDate = LocalDate.parse(beginTimeStr, formatter);
+        LocalDate endDate = LocalDate.parse(endTimeStr, formatter);
+
+        // 计算两个日期之间的天数差
+        return endDate.toEpochDay() - beginDate.toEpochDay() + 1;
+    }
+    private long dayCount2(LocalDate createDate) {
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 计算两个日期之间的天数差
+        return ChronoUnit.DAYS.between(createDate, currentDate);
+    }
+    private void calculatedMean(SysDeptVo sysDept,long day) {
+        // 创建 DecimalFormat 对象，指定保留两位小数的格式
+        DecimalFormat df = new DecimalFormat("#.00");
+
+        // 将字符串转换成数值类型进行计算
+        double amount = Double.parseDouble(sysDept.getAmount());
+        double strokeCount = Double.parseDouble(sysDept.getStrokeCount());
+
+        // 计算平均值
+        double meanAmount = amount / day;
+        double meanStrokeCount = strokeCount / day;
+
+        // 格式化计算结果，保留两位小数
+        String meanAmountStr = df.format(meanAmount);
+        String meanStrokeCountStr = df.format(meanStrokeCount);
+
+        // 将计算结果设置回对象中
+        sysDept.setDailyAmount(meanAmountStr);
+        sysDept.setStrokesPerDay(meanStrokeCountStr);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
index 26882bfa5..c26d9f8ef 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
@@ -7,5 +7,36 @@ import lombok.Data;
 public class AllOrderInfoVo extends AllOrderInfo {
     private String userName;
     private String userMobile;
+    private String storeName;
+    private String mchntCd;
     private Double sumPayMoney;
+
+    //交易金额
+    private String amount;
+    // 交易笔数
+    private String strokeCount;
+    // 笔单价
+    private String unitPrice;
+    // 日均交易金额
+    private String dailyAmount;
+    // 日均交易笔数
+    private String strokesPerDay;
+    private String storeCount   ;
+    private String inertiaStore;
+
+
+
+    private String CASH;
+    private String WECHAT;
+    private String ALIPAY;
+    private String balance;
+    private String CASHCount;
+    private String WECHATCount;
+    private String ALIPAYCount;
+    private String balanceCount;
+    private String refBalance;
+    private String refBalanceCount;
+
+
+
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
index b3b160eb6..8d8a6a367 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
@@ -114,7 +114,7 @@ public class PrinterServiceImpl implements PrinterService {
             if ("success".equals(errorDescription)) {
                 JSONObject body = jsonObject.getJSONObject("body");
                 String accessToken = body.getString("access_token");
-                RedisUtil.set("scancodemodel+"+storeId,accessToken,60*60*24*20);
+                RedisUtil.set("scancodemodel+"+storeId,accessToken,60*60*24*7);
                 return accessToken;
             }
         } catch (Exception e) {
@@ -170,6 +170,14 @@ public class PrinterServiceImpl implements PrinterService {
         Map<String, Object> map = jsonObject.getInnerMap();
         //获取支付参数
         log.info("url:{}",url);
+        if (ObjectUtil.isNotEmpty(url)) {
+            String error = jsonObject.getString("error");
+            if ("18".equals(error)) {
+                getToken(storeId);
+                printIndex(payAmount,storeId);
+            }
+
+        }
         return map.get("error_description").toString();
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java
index 6bd466f24..e2e84aaa6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java
@@ -49,6 +49,7 @@ public interface StoreService extends IService<MtStore> {
     MtStore queryStoreById(Integer id) throws BusinessCheckException;
 
     MtStore queryStoreById2(Integer id) throws BusinessCheckException;
+    MtStore queryStoreById3(Integer id);
 
     /**
      * 根据店铺id列表获取店铺信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java
index 4dc43e29f..84b932ea4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java
@@ -188,6 +188,14 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
         return mtStoreMapper.selectById(id);
     }
 
+    @Override
+    public MtStore queryStoreById3(Integer id) {
+        if (id == null) {
+            return null;
+        }
+        return mtStoreMapper.selectById(id);
+    }
+
     /**
      * 获取系统默认店铺
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/StaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/StaffService.java
index 58c687581..ebbdfd118 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/StaffService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/StaffService.java
@@ -38,6 +38,7 @@ public interface StaffService {
      * @throws BusinessCheckException
      */
     MtStaff queryStaffById(Integer id) throws BusinessCheckException;
+    MtStaff queryStaffById2(Integer id);
 
     /**
      * 审核更改状态(禁用，审核通过)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java
index 81982e378..c67ee4d8f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java
@@ -170,6 +170,10 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
     public MtStaff queryStaffById(Integer id) {
         return mtStaffMapper.selectById(id);
     }
+    @Override
+    public MtStaff queryStaffById2(Integer id) {
+        return mtStaffMapper.selectById(id);
+    }
 
     /**
      * 更改员工状态
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/SysDeptMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/SysDeptMapper.java
index 5541a9185..0cce53343 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/SysDeptMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/SysDeptMapper.java
@@ -1,7 +1,10 @@
 package com.fuint.system.dept.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.system.dept.entity.SysDept;
+import com.fuint.system.dept.vo.SysDeptVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -46,6 +49,10 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      */
     public List<SysDept> selectChildrenDeptById(Long deptId);
 
+    IPage<SysDeptVo> selectChildrenDeptById2(@Param("page") Page page, @Param("ancestors") Long ancestors, @Param("deptId") Long deptId, @Param("deptType") String deptType);
+    List<SysDeptVo> selectChildrenDeptByIdStore(@Param("deptId") Long deptId);
+    SysDeptVo getStoreByDept(@Param("deptId") Long deptId);
+
     /**
      * 根据ID查询所有子部门（正常状态）
      * 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
index 6aa87d79f..05b8f50ac 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
@@ -62,7 +62,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectChildrenDeptById"  resultType="com.fuint.system.dept.entity.SysDept">
 		select * from sys_dept where find_in_set(#{deptId}, ancestors)
 	</select>
-	
+
+	<select id="selectChildrenDeptById2"  resultType="com.fuint.system.dept.vo.SysDeptVo">
+		select * from sys_dept where find_in_set(#{ancestors}, ancestors)
+		                             <if test="deptType !=null">
+										 and dept_type = #{deptType}
+									 </if>
+									<if test="deptId !=null and deptId !=''">
+										and dept_id = #{deptId}
+									</if>
+
+	</select>
+
+	<select id="selectChildrenDeptByIdStore"  resultType="com.fuint.system.dept.vo.SysDeptVo">
+			select sd.dept_id deptId,
+			       ms.id storeId,
+			       ms.address
+			       from sys_dept sd
+					 left join mt_store ms on sd.dept_id = ms.contract_dept_id
+					where find_in_set(#{deptId}, sd.ancestors)
+				and sd.dept_type = '3'
+	</select>
+
+
+	<select id="getStoreByDept"  resultType="com.fuint.system.dept.vo.SysDeptVo">
+		select sd.dept_id deptId,
+			   ms.id storeId,
+			   ms.address addr
+		from sys_dept sd
+				 left join mt_store ms on sd.dept_id = ms.contract_dept_id
+		where sd.dept_id = #{deptId}
+		  and sd.dept_type = '3'
+		limit 1
+	</select>
+
+
+
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
 		select count(*) from sys_dept where status = 'qy'  and find_in_set(#{deptId}, ancestors) and if_delete = 0
 	</select>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/vo/SysDeptVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/vo/SysDeptVo.java
new file mode 100644
index 000000000..15691bd62
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/vo/SysDeptVo.java
@@ -0,0 +1,26 @@
+package com.fuint.system.dept.vo;
+
+import com.fuint.system.dept.entity.SysDept;
+import lombok.Data;
+
+@Data
+public class SysDeptVo extends SysDept {
+    private Long storeId;
+    private String addr;
+
+    //交易金额
+    private String amount;
+    // 交易笔数
+    private String strokeCount;
+    // 笔单价
+    private String unitPrice;
+    // 日均交易金额
+    private String dailyAmount;
+    // 日均交易笔数
+    private String strokesPerDay;
+
+    private String inertiaStore;
+    private String parentStoreName;
+    private Long parentStoreId;
+
+}
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserMapper.java
index d116116b2..a374d01f7 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserMapper.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtUserMapper.java
@@ -22,6 +22,7 @@ public interface MtUserMapper extends BaseMapper<MtUser> {
     List<MtUser> queryMemberByName(@Param("merchantId") Integer merchantId, @Param("name") String name);
 
     MtUser queryMemberByOpenId(@Param("merchantId") Integer merchantId, @Param("openId") String openId);
+    MtUser queryMemberById(@Param("id") Integer id);
 
     MtUser queryMemberByOpenId2(@Param("openId") String openId);
 
diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml
index b257a7fc5..ff139e9ae 100644
--- a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml
+++ b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml
@@ -86,5 +86,9 @@
         </if>
         GROUP BY u.`ID` ORDER BY SUM(o.`AMOUNT`) DESC LIMIT 10
     </select>
+    <select id="queryMemberById" resultType="com.fuint.repository.model.MtUser">
+        select * from mt_user t where t.Id = #{id}
+        limit 1
+    </select>
 
 </mapper>