From f731c180cb299f797ae0d504e0428b8b30ea1bf0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 30 Jul 2024 15:33:01 +0800
Subject: [PATCH] no message

---
 fuintAdmin_zt/src/views/Site/index.vue        |  37 +++-
 .../dai_yunyingfenxi/tab/paytype.vue          |   6 +-
 .../jiaoyiduizhang/tab/int.vue                |  14 +-
 .../jiaoyiduizhang/tab/oil.vue                |  18 +-
 .../jiaoyiduizhang/tab/store.vue              |  22 +--
 .../jiaoyiduizhang/tab/vip.vue                |  44 +++--
 .../yunyingfenxi/tab/oil.vue                  |  24 ++-
 .../yunyingfenxi/tab/store.vue                |  12 +-
 .../yunyingfenxi/tab/vip.vue                  |  14 +-
 fuintAdmin_zt/src/views/setting/app/index.vue | 165 +++++++++++-------
 .../src/views/system/notify/page/record.vue   |  14 +-
 .../mapper/xml/DeptServiceFeeInfoMapper.xml   |   1 +
 .../business/sys/mapper/xml/SysAppMapper.xml  |   3 +
 .../service/impl/UserBalanceServiceImpl.java  |  14 +-
 14 files changed, 247 insertions(+), 141 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index a41c3f93d..28d78986b 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -285,7 +285,8 @@
                       </span>
                     </span>
                   </el-form-item>
-                  <template v-if="ruleForm.deptType !== '3'">
+<!--                  <template v-if="ruleForm.deptType !== '3'">-->
+                    <template v-if="is2Store">
                     <el-row >
                       <el-col :span="20">
                         <el-form-item label="计费方式" prop="turnoverType">
@@ -1094,7 +1095,9 @@ export default {
           {
             name:'角色信息',
           },
-        ]
+        ],
+        // 判断是否是二级门店
+        is2Store:false,
       };
     },
     watch: {
@@ -1329,7 +1332,6 @@ export default {
           deptId:''
         }
         this.getDutyList();
-
       },
       getDutyList(){
         this.loading = true;
@@ -1407,7 +1409,7 @@ export default {
         let evenNumbers = typeList
         // isClick
         if (this.deptType == 3  || (this.deptType == 2 && !this.isClick)) {
-          evenNumbers = typeList.filter(number => number.label === "基本门店");
+          evenNumbers = typeList.filter(number => number.label === "单油站");
           this.ruleForm.deptType = "3"
         }
         return evenNumbers
@@ -1448,6 +1450,7 @@ export default {
         this.deptType = data.deptType
         this.deptId = data.id
         this.parentDeptType = data.deptType
+        this.activeindex = 0
         // 新增节点
         this.appedit(data.id,data.label)
         // 用户请求
@@ -1592,7 +1595,15 @@ export default {
         // 清除表单
         this.cleanRuleForm()
         this.activeName = 'info'
-        this.activeindex = 1
+        this.activeindex = 0
+
+        // console.log("123",dataid)
+        if (data.id !== 100) {
+          this.isTopDept = false
+        }else {
+          this.isTopDept = true
+
+        }
         this.pdinfo = 1
         this.timeFrame = []
         this.beginTime = ""
@@ -1603,6 +1614,11 @@ export default {
         event.stopPropagation();
         this.isAdd = true
         // 新增树
+        if (data.id == 100) {
+          this.is2Store = true
+        }else {
+          this.is2Store = true
+        }
       },
       cleanRuleForm() {
         this.ruleForm= {
@@ -1623,11 +1639,16 @@ export default {
         let _this = this
         // 默认类型
         this.isClick = false
+         this.activeindex = 0
         this.ruleForm.deptType = deptType
         this.$nextTick(() => {
           console.log("新增树的返回222", this.ruleForm,id,label);
         });
 
+        // if (id != 100) {
+        //   this.isTopDept = false
+        // }
+
         // _this.ruleForm.deptType = '1'
         // 点击树获取部门信息
          this.cascader = []
@@ -1639,6 +1660,12 @@ export default {
              this.parentName = res.data.parentName
            // if (res.data.parentId==0){
              this.ruleForm.parentId = res.data.deptId
+           if (this.ruleForm.parentId == 100) {
+             this.is2Store = true
+           }else {
+             this.is2Store = false
+
+           }
            // }else {
            //   this.ruleForm.parentId = res.data.parentId
            // }
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 35be40e0c..30aedb7c2 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -70,7 +70,11 @@
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" align="center" label="机构名称"></el-table-column>
           <el-table-column prop="parentName" 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="累计交易金额（万元）">
+            <template slot-scope="scope">
+              <span>{{scope.row.payMoney/100000 || 0}}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="count" align="center" label="累计交易笔数"></el-table-column>
           <el-table-column prop="storeName" align="center" label="交易金额">
             <el-table-column prop="wechatMoney" align="center" label="微信"></el-table-column>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
index bba7d733d..32cfa8ea7 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -43,7 +43,7 @@
           <el-select
             v-model="queryParams.status"
             clearable
-            placeholder="支付状态"
+            placeholder="订单状态"
           >
             <el-option label="已支付" value="paid"/>
             <el-option label="未支付" value="unpaid"/>
@@ -69,7 +69,7 @@
 
 
 
-        <el-form-item class="" style="float: right;">
+        <el-form-item class="" style="float: right;margin-right:0px">
           <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>
@@ -93,7 +93,7 @@
             <template slot-scope="scope">
               <span v-if="scope.row.payChannel=='cashier'">收银台</span>
               <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">平台</span>
+              <span v-else-if="scope.row.payChannel=='PC'">收银台</span>
               <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
               <span v-else>其他</span>
             </template>
@@ -108,9 +108,9 @@
           </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 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>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
index ba1df5a4a..aa4db4ad8 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -45,9 +45,9 @@
             clearable
             placeholder="支付状态"
           >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
+            <el-option label="支付成功" value="paid"/>
+            <el-option label="待支付" value="unpaid"/>
+            <el-option label="退款成功" value="refund"/>
           </el-select>
         </el-form-item>
         <el-form-item label="">
@@ -69,7 +69,7 @@
 
 
 
-        <el-form-item class="" style="float: right;">
+        <el-form-item class="" style="float: right;margin-right:0px">
           <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>
@@ -90,7 +90,7 @@
             <template slot-scope="scope">
               <span v-if="scope.row.terminal=='cashier'">收银台</span>
               <span v-else-if="scope.row.terminal=='POS'">POS机</span>
-              <span v-else-if="scope.row.terminal=='PC'">平台</span>
+              <span v-else-if="scope.row.terminal=='PC'">收银台</span>
               <span v-else-if="scope.row.terminal=='applet'">小程序</span>
               <span v-else>其他</span>
             </template>
@@ -105,9 +105,9 @@
           </el-table-column>
           <el-table-column prop="orderStatus" align="center" label="支付状态">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">已退款</el-tag>
+              <el-tag v-if="scope.row.orderStatus == 'unpaid'">待支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">支付成功</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">退款成功</el-tag>
               <el-tag type="danger" v-else>支付失败</el-tag>
             </template>
           </el-table-column>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
index 1b3793b66..760403a9d 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -31,7 +31,7 @@
           <el-select
             v-model="queryParams.payType"
             clearable
-            placeholder="支付方式"
+            placeholder="订单状态"
           >
             <el-option label="现金" value="CASH"/>
             <el-option label="微信" value="WECHAT"/>
@@ -45,9 +45,9 @@
             clearable
             placeholder="支付状态"
           >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
+            <el-option label="支付成功" value="paid"/>
+            <el-option label="待支付" value="unpaid"/>
+            <el-option label="退款成功" value="refund"/>
           </el-select>
         </el-form-item>
         <el-form-item label="">
@@ -69,7 +69,7 @@
 
 
 
-        <el-form-item class="" style="float: right;">
+        <el-form-item class="" style="float: right;margin-right:0px">
           <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>
@@ -83,12 +83,12 @@
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
           <el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
+          <el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
           <el-table-column prop="payChannel" align="center" label="订单类型">
             <template slot-scope="scope">
               <span v-if="scope.row.payChannel=='cashier'">收银台</span>
               <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">平台</span>
+              <span v-else-if="scope.row.payChannel=='PC'">收银台</span>
               <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
               <span v-else>其他</span>
             </template>
@@ -103,9 +103,9 @@
           </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 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>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index 6ca26c8ca..d02033d87 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -47,9 +47,9 @@
             clearable
             placeholder="支付状态"
           >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
+            <el-option label="支付成功" value="paid"/>
+            <el-option label="待支付" value="unpaid"/>
+            <el-option label="退款失败" value="refund"/>
             <el-option label="支付失败" value="payFail"/>
           </el-select>
         </el-form-item>
@@ -72,7 +72,7 @@
 
 
 
-        <el-form-item class="" style="float: right;">
+        <el-form-item class="" style="float: right;margin-right:0px">
           <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>
@@ -83,28 +83,15 @@
         <el-table
           :data="orderList"
           style="width: 100%">
-          "storeId": "",
-          "orderNo": "",
-          "payChannel": "",
-          "payAmount": "",
-          "payType": "",
-          "status": "",
-          "name": "",
-          "mobile": "",
-          "rechargeType": "",
-          "mchntCd": "",
-          "paymentChannel": "",
-          "createTime": "",
-          "payTime": ""
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
           <el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
+          <el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
           <el-table-column prop="payChannel" align="center" label="订单类型">
             <template slot-scope="scope">
               <span v-if="scope.row.payChannel=='cashier'">收银台</span>
               <span v-else-if="scope.row.payChannel=='POS'">POS机</span>
-              <span v-else-if="scope.row.payChannel=='PC'">平台</span>
+              <span v-else-if="scope.row.payChannel=='PC'">收银台</span>
               <span v-else-if="scope.row.payChannel=='applet'">小程序</span>
               <span v-else>其他</span>
             </template>
@@ -119,9 +106,9 @@
           </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 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>
@@ -136,8 +123,17 @@
             </el-table-column>
           </el-table-column>
           <el-table-column prop="mchntCd" align="center" label="支付通道">
+            <template slot-scope="scope">
+              {{scope.row.mchntCd?scope.row.mchntCd:'--'}}
+
+            </template>
           </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
+          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
+
+            <template slot-scope="scope">
+              {{scope.row.mchntCd?scope.row.paymentChannel:'--'}}
+
+            </template></el-table-column>
           <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
           <el-table-column prop="payTime" align="center" label="订单完成时间" >
             <template slot-scope="scope">
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index da16ea354..1058e06db 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -81,22 +81,38 @@
           <el-table-column align="center" prop="sum" label="累计交易笔数"></el-table-column>
           <el-table-column align="center" prop="oilNum" label="累计交易升数"></el-table-column>
           <el-table-column align="center" label="92#汽油">
-            <el-table-column align="center" prop="amount92" label="交易金额(万元)"></el-table-column>
+            <el-table-column align="center" prop="amount92" label="交易金额(万元)">
+              <template slot-scope="scope">
+                {{(scope.row.amount92/10000).toFixed(6)}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="count92" label="交易笔数"></el-table-column>
             <el-table-column align="center" prop="num92" label="交易升数"></el-table-column>
           </el-table-column>
           <el-table-column align="center" label="95#汽油">
-            <el-table-column align="center" prop="amount95" label="交易金额(万元)"></el-table-column>
+            <el-table-column align="center" prop="amount95" label="交易金额(万元)">
+              <template slot-scope="scope">
+                {{(scope.row.amount95/10000).toFixed(6)}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="count95" label="交易笔数"></el-table-column>
             <el-table-column prop="num95" label="交易升数"></el-table-column>
           </el-table-column>
           <el-table-column align="center" label="98#汽油">
-            <el-table-column align="center" prop="amount98" label="交易金额(万元)"></el-table-column>
+            <el-table-column align="center" prop="amount98" label="交易金额(万元)">
+              <template slot-scope="scope">
+                {{(scope.row.amount98/10000).toFixed(6)}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="count98" label="交易笔数" ></el-table-column>
             <el-table-column align="center" prop="num98" label="交易升数" ></el-table-column>
           </el-table-column>
           <el-table-column align="center" label="0#柴油">
-            <el-table-column align="center" prop="amount0" label="交易金额(万元)" ></el-table-column>
+            <el-table-column align="center" prop="amount0" label="交易金额(万元)" >
+              <template slot-scope="scope">
+                {{(scope.row.amount0/10000).toFixed(6)}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="count0" label="交易笔数" ></el-table-column>
             <el-table-column align="center" prop="num0" label="交易升数" ></el-table-column>
           </el-table-column>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 820c81e00..9cd86ceb2 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -66,13 +66,21 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
-          <el-table-column prop="payAmounts" label="累计交易金额 (万元)"  align="center"></el-table-column>
+          <el-table-column prop="payAmounts" label="累计交易金额 (万元)"  align="center">
+            <template slot-scope="scope">
+              {{(scope.row.payAmounts/10000).toFixed(6)}}
+            </template>
+          </el-table-column>
           <el-table-column prop="counts" label="累计交易笔数"  align="center"></el-table-column>
           <el-table-column prop="goodsNums" label="累计销售商品数量"  align="center"></el-table-column>
           <el-table-column label="商品信息" align="center">
                 <el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
                 <el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center"></el-table-column>
+                <el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
+                  <template slot-scope="scope">
+                    {{(scope.row.payAmounts/10000).toFixed(6)}}
+                  </template>
+                </el-table-column>
 
           </el-table-column>
           <el-table-column label="热销品类信息" align="center">
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index af644ac14..554483f48 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 20px">
+  <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -164,8 +164,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
       exportExcelCashier() {
         let dateRange = []
         if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
+          // dateRange.push(this.beginTime.toLocaleDateString())
+          // dateRange.push(this.endTime.toLocaleDateString())
         }
         exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
           const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
@@ -177,8 +177,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
       getOrderStatistics() {
         let dateRange = []
         if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
+          // dateRange.push(this.beginTime.toLocaleDateString())
+          // dateRange.push(this.endTime.toLocaleDateString())
         }
         getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
           this.orderStatistics = res.data
@@ -190,8 +190,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
       getList(val){
         let dateRange = []
         if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
+          // dateRange.push(this.beginTime.toLocaleDateString())
+          // dateRange.push(this.endTime.toLocaleDateString())
         }
         getFenXiUserbalanceListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
           this.orderList = response.data.records;
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index cdeaebf42..7c479a1d5 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -2,15 +2,19 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="orgName">
-          <el-input
-            v-model="queryParams.orgName"
-            placeholder="请输入机构名称"
+        <el-form-item label="" prop="legalRepresentativeContact">
+
+          <el-select
+            v-model="queryParams.orgId"
             clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
+            placeholder="所属机构"
+
+          >
+            <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+            </el-option>
+          </el-select>
         </el-form-item>
+
         <el-form-item label="" prop="legalRepresentativeContact">
           <el-input
             v-model="queryParams.legalRepresentativeContact"
@@ -20,13 +24,16 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-select v-model="queryParams.appStatus" placeholder="请选择小程序状态">
-          <el-option label="停用" value="0" ></el-option>
-          <el-option label="启用" value="1" ></el-option>
-        </el-select>
-        <el-form-item style="float: right">
+        <el-form-item label="" prop="legalRepresentativeContact">
+
+          <el-select v-model="queryParams.appStatus" placeholder="请选择小程序状态">
+            <el-option label="停用" value="0" ></el-option>
+            <el-option label="启用" value="1" ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
           <el-button
             type="primary"
             @click="handleAdd"
@@ -34,11 +41,11 @@
           >新增小程序配置</el-button>
         </el-form-item>
       </el-form>
-    </el-card>
+      <!--    </el-card>-->
 
-    <!--    列表信息-->
-    <el-card style="margin-top: 20px" >
-      <el-table :data="tableData" style="width: 100%" border="">
+      <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
+      <!--    <el-card style="margin-top: 20px" >-->
+      <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
         <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码"></el-table-column>
@@ -88,49 +95,59 @@
 
     </el-card>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="deviceInfo" label-width="80px">
-        <el-form :model="deviceInfo" ref="deviceForm" label-width="120px">
-          <el-form-item label="机构名称" prop="orgName">
-            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>
-          </el-form-item>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
+      <!--      <el-form ref="form" :model="deviceInfo" label-width="80px">-->
+      <el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
+        <!--          <el-form-item label="机构名称" prop="orgName">-->
+        <!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
+        <!--          </el-form-item>-->
 
-<!--          <el-form-item label="机构名称" prop="orgName">-->
-<!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
-<!--          </el-form-item>-->
-<!--          -->
+        <!--          <el-form-item label="机构名称" prop="orgName">-->
+        <!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
+        <!--          </el-form-item>-->
+        <!--          -->
+        <el-form-item label="机构名称" prop="orgId">
+          <el-select
+            v-model="deviceInfo.orgId"
+            clearable
+            placeholder="机构名称"
+            style="width: 300px;"
+          >
+            <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"  :value="item.deptId">
+            </el-option>
+          </el-select>
 
-
-          <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-            <el-input v-model="deviceInfo.unifiedSocialCreditCode"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序appID" prop="appId">
-            <el-input v-model="deviceInfo.appId"></el-input>
-          </el-form-item>
-          <el-form-item label="密钥" prop="appKey">
-            <el-input v-model="deviceInfo.appKey"></el-input>
-          </el-form-item>
-          <el-form-item label="法人姓名" prop="legalRepresentativeName">
-            <el-input v-model="deviceInfo.legalRepresentativeName"></el-input>
-          </el-form-item>
-          <el-form-item label="法人微信号" prop="legalRepresentativeWechat">
-            <el-input v-model="deviceInfo.legalRepresentativeWechat"></el-input>
-          </el-form-item>
-          <el-form-item label="法人联系方式" prop="legalRepresentativeContact">
-            <el-input v-model="deviceInfo.legalRepresentativeContact"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序状态" prop="appStatus">
-              <el-switch
-                v-model="deviceInfo.appStatus"
-                active-color="#13ce66"
-                inactive-color="#ff4949">
-              </el-switch>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
-          </el-form-item>
-        </el-form>
+        </el-form-item>
+        <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
+          <el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="小程序appID" prop="appId">
+          <el-input v-model="deviceInfo.appId" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="密钥" prop="appKey">
+          <el-input v-model="deviceInfo.appKey" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="法人姓名" prop="legalRepresentativeName">
+          <el-input v-model="deviceInfo.legalRepresentativeName" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="法人微信号" prop="legalRepresentativeWechat">
+          <el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="法人联系方式" prop="legalRepresentativeContact">
+          <el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="小程序状态" prop="appStatus">
+          <el-switch
+            v-model="deviceInfo.appStatus"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
+        </el-form-item>
       </el-form>
+      <!--      </el-form>-->
     </el-dialog>
 
   </div>
@@ -141,6 +158,7 @@
 
 import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
 import {updateBannerApi} from "@/api/sys/banner";
+import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
 export default {
   name: "printIndex",
@@ -148,9 +166,12 @@ export default {
   data() {
     return {
       tableData: [],
+      deptList: [],
+
       deviceInfo: {
         id: null,            // 自增id
         orgName: '',   // 机构名称
+        orgId: '',   // 机构名称
         unifiedSocialCreditCode: '',   // 统一社会信用代码
         appId: '',   // 小程序appID
         appKey: '',   // 密钥
@@ -160,6 +181,15 @@ export default {
         appStatus: false,   // 小程序状态
         createByName: '',
       },
+      rule: {
+        orgId: [{required: true, message: '请选择机构名称', trigger: 'blur'},],
+        unifiedSocialCreditCode: [{required: true, message: '请填写统一社会信用代码', trigger: 'blur'},],
+        appId: [{required: true, message: '请填写小程序appID', trigger: 'blur'},],
+        appKey: [{required: true, message: '请填写密钥', trigger: 'blur'},],
+        legalRepresentativeName: [{required: true, message: '请填写法人姓名', trigger: 'blur'},],
+        legalRepresentativeWechat: [{required: true, message: '请填写法人微信号', trigger: 'blur'},],
+        legalRepresentativeContact: [{required: true, message: '请填写法人联系方式', trigger: 'blur'},],
+      },
       // 是否显示弹出层
       open: false,
       title:"",
@@ -169,6 +199,7 @@ export default {
         page: 1,
         pageSize: 10,
         orgName:'',
+        orgId:'',
         legalRepresentativeContact:'',
         appStatus:'',
       },
@@ -176,8 +207,14 @@ export default {
   },
   created() {
     this.getList()
+    this.getDeptList()
   },
   methods: {
+    getDeptList() {
+      getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
+        this.deptList = response.data.records;
+      })
+    },
     getList(){
       getAppListApi(this.queryParams).then(res=>{
         this.tableData = res.data.records;
@@ -200,7 +237,11 @@ export default {
     },
     submitDeviceInfo() {
       // 在这里调用接口提交设备信息数据
-      console.log('提交设备信息数据:', this.deviceInfo);
+
+      let filter = this.deptList.filter(item => item.deptId == this.deviceInfo.orgId);
+
+      this.deviceInfo.orgName = filter[0].deptName
+
       if (this.deviceInfo.id) {
         updateAppApi(this.deviceInfo).then(res=>{
           if(res.code === 200) {
@@ -240,24 +281,24 @@ export default {
         pageSize: 10,
         deviceName:'',
       },
-      this.getList()
+        this.getList()
     },
     handleAdd(e) {
       this.clean()
       this.open = true;
-      this.title = "增加小程序配置"
+      this.title = "新增小程序配置"
     },
     edit(e) {
       this.clean()
       this.open = true;
       this.title = "编辑小程序配置"
       this.deviceInfo = e
-      console.log('提交小程序配置信息数据:', this.deviceInfo);
+      console.log('提交设备信息数据:', this.deviceInfo);
 
     },
     del(e) {
 
-      this.$confirm('此操作将永久删除该小程序配置, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index 1be57b998..28321c2c4 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -95,16 +95,16 @@
 
     </el-card>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :model="form" label-width="80px">
         <!-- 通知名称 -->
         <el-form-item label="通知名称" :required="true">
-          <el-input v-model="form.notificationName" placeholder="请输入通知名称"></el-input>
+          <el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px;"></el-input>
         </el-form-item>
 
         <!-- 通知类型 -->
         <el-form-item label="通知类型" :required="true">
-          <el-select v-model="form.notificationType" placeholder="请选择通知类型">
+          <el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px;">
             <el-option label="到期提醒" value="到期提醒"></el-option>
             <el-option label="库存预警" value="库存预警"></el-option>
             <!-- 添加其他选项 -->
@@ -113,17 +113,17 @@
 
         <!-- 通知模板 -->
         <el-form-item label="通知模板" :required="true">
-          <el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200" show-word-limit></el-input>
+          <el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200" show-word-limit style="width: 300px;"></el-input>
         </el-form-item>
 
         <!-- 接收角色 -->
         <el-form-item label="接收角色" :required="true">
-          <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" @change="getUserByRoles">
-            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
+          <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" @change="getUserByRoles" style="width: 300px;">
+            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="接收用户" :required="true">
-          <div style="border: 1px solid #DCDFE6;width: 100%;height: 100px;  border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
+          <div style="border: 1px solid #DCDFE6;width: 300px;height: 100px;  border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
             <div @click="clickAdd" style="  display: flex;margin: 10px;">
               <div style="height: 32px;display: flex;
                 justify-content: center; /* 水平居中 */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml
index bba01fdbc..1804fd305 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml
@@ -88,6 +88,7 @@ service_fee_statistics,service_fee_limit,status,create_name,create_time
         from dept_service_fee_info
         where  dept_id = #{deptId}
           and status = 1
+        limit 1
     </select>
     <select id="getAllYue" resultType="java.util.HashMap">
         select
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
index 98765b096..22fefa5a4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
@@ -44,6 +44,9 @@ legal_representative_id,legal_representative_contact,app_status,create_time,crea
             <if test="sysApp.appId != null and sysApp.appId != ''">
                 and app_id = #{sysApp.appId}
             </if>
+            <if test="sysApp.orgId != null and sysApp.orgId != ''">
+                and org_id = #{sysApp.orgId}
+            </if>
             <if test="sysApp.legalRepresentativeName != null and sysApp.legalRepresentativeName != ''">
                 and legal_representative_name = #{sysApp.legalRepresentativeName}
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
index a0272a515..814ff8d8c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -120,8 +121,17 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
 
         Map<String, Object> dataByZt = userBalanceMapper.getDataByZt(user);
         Map<String, Object> leiJiInfo = allOrderInfoMapper.getShuJuVipInfo(user);
-        dataByZt.put("tongjMoney",leiJiInfo.get("tongjMoney"));
-        dataByZt.put("tongjXfMoney",leiJiInfo.get("tongjXfMoney"));
+        if (ObjectUtil.isEmpty(dataByZt)){
+            dataByZt = new HashMap<>();
+        }
+        if (ObjectUtil.isEmpty(leiJiInfo)) {
+            leiJiInfo = new HashMap<>();
+            leiJiInfo.put("tongjXfMoney","0");
+            leiJiInfo.put("tongjMoney","0");
+
+        }
+        dataByZt.put("tongjMoney",ObjectUtil.isNotEmpty(leiJiInfo.get("tongjMoney"))?leiJiInfo.get("tongjMoney"):"0");
+        dataByZt.put("tongjXfMoney",ObjectUtil.isNotEmpty(leiJiInfo.get("tongjXfMoney"))?leiJiInfo.get("tongjXfMoney"):"0");
         return dataByZt;
     }