diff --git a/fuintAdmin_zt/src/views/Site/components/afterff.vue b/fuintAdmin_zt/src/views/Site/components/afterff.vue
index c04f4f39c..2695b08b3 100644
--- a/fuintAdmin_zt/src/views/Site/components/afterff.vue
+++ b/fuintAdmin_zt/src/views/Site/components/afterff.vue
@@ -1,4 +1,13 @@
 <script>
+import {
+  addAfterApi,
+  addYearApi,
+  getAfterListApi,
+  getYearListApi,
+  updateAfterApi,
+  updateYearApi
+} from "@/api/system/Site/compant";
+
 export default {
   name: "afterff",
   data() {
@@ -14,26 +23,79 @@ export default {
         status:'进行中',
         upadate: '2016-05-02',
       }, ],
+      form: {
+          deductionRate: '', // 扣点费率
+          likelyTransactionVolume: '100', // 已发生交易流量
+          serviceFeeStatistics: 0, // 系统服务费统计（这里假设为0，实际可能需要计算）
+          serviceFeeLimit: '', // 系统服务费限制
+        paymentAmount: '', // 收款金额
+        deptId:this.deptId,
+        },
     }
   },
   props: {
     deptId: String
   },
+  created() {
+    this.getList();
+  },
   methods: {
+    getList() {
+      getAfterListApi({deptId : this.deptId}).then(res => {
+        this.tableData = res.data.records
+      })
+    },
     onSubmit() {
       console.log('表单提交', this.form);
       // 在这里添加提交表单的逻辑
+      if (this.form.id) {
+        updateAfterApi(this.form).then(res => {
+          this.getList();
+          this.dialogVisible = false;
+          this.dialogVisible2 = false;
+        })
+      }else {
+        addAfterApi(this.form).then(res => {
+          this.getList();
+          this.dialogVisible = false;
+          this.dialogVisible2 = false;
+        })
+      }
     },
     onCancel() {
       console.log('取消操作');
       // 在这里添加取消操作的逻辑
-    },
-    submitForm(){
+      this.dialogVisible = false
+      this.dialogVisible2 = false
+
 
     },
-    resetForm(){
+
+
+    handleUpdate1(data){
+      this.dialogVisible = true
 
     },
+    handleEdit(data){
+      this.form = data
+
+      this.dialogVisible = true
+    },
+    handleEditshoukuan(data){
+      this.form = data
+      this.dialogVisible2 = true
+
+    },
+    cl() {
+      this.form = {
+        deductionRate: '', // 扣点费率
+        likelyTransactionVolume: '100', // 已发生交易流量
+        serviceFeeStatistics: 0, // 系统服务费统计（这里假设为0，实际可能需要计算）
+        serviceFeeLimit: '', // 系统服务费限制
+        paymentAmount: '', // 收款金额
+        deptId:this.deptId,
+      }
+    }
   }
 }
 </script>
@@ -43,7 +105,7 @@ export default {
     <el-table
       :data="tableData"
       border
-      style="width: 100%;margin-left: 55px ">
+      style="width: 95%;margin-left: 55px ">
       <el-table-column
         prop="deductionRate"
         align="center"
@@ -95,8 +157,12 @@ export default {
         <template slot-scope="scope">
           <el-button
             size="mini"
-            @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+            @click="handleEdit(scope.row)">修改</el-button>
+          <el-button
+            size="mini"
+            @click="handleEditshoukuan(scope.row)">收款</el-button>
         </template>
+
       </el-table-column>
     </el-table>
     <el-dialog
@@ -109,13 +175,13 @@ export default {
           <el-input v-model="form.deductionRate" placeholder="请输入扣点费率" suffix="%"></el-input>
         </el-form-item>
         <el-form-item label="已发生交易流量">
-          <el-input v-model="form.transactionFlow" placeholder="请输入已发生交易流量" suffix="万元"></el-input>
+          <el-input v-model="form.likelyTransactionVolume" placeholder="请输入已发生交易流量" suffix="万元" readonly></el-input>
         </el-form-item>
         <el-form-item label="系统服务费">
-          <el-input v-model="form.systemFee" placeholder="请输入系统服务费" suffix="万元"></el-input>
+          <el-input v-model="form.serviceFeeStatistics" placeholder="请输入系统服务费" suffix="万元" readonly></el-input>
         </el-form-item>
         <el-form-item label="系统服务费限制">
-          <el-input v-model="form.systemFeeLimit" placeholder="请输入系统服务费限制" suffix="万元"></el-input>
+          <el-input v-model="form.serviceFeeLimit" placeholder="请输入系统服务费限制" suffix="万元"></el-input>
         </el-form-item>
       </el-form>
       <div class="button-group">
@@ -132,25 +198,26 @@ export default {
       <el-form :model="form" label-width="120px">
         <el-form-item label="扣点费率">
           <!-- 假设扣点费率是固定的，这里仅显示 -->
-          <span>{{ form.deductionRate }}%</span>
+          <span>{{ form.deductionRate }}</span>
+          <el-input v-model="form.deductionRate" placeholder="" readonly></el-input>
+
         </el-form-item>
         <el-form-item label="已发生交易流量">
-          <el-input v-model="form.transactionVolume" placeholder="请输入交易流量"></el-input>
+          <el-input v-model="form.likelyTransactionVolume" placeholder="" readonly></el-input>
         </el-form-item>
         <el-form-item label="系统服务费统计">
-          <!-- 假设这是计算得出的，这里仅显示 -->
-          <span>{{ form.systemServiceFee }}万元</span>
+          <el-input v-model="form.serviceFeeStatistics" placeholder="" readonly></el-input>
         </el-form-item>
         <el-form-item label="系统服务费限制">
           <!-- 假设这是固定的，这里仅显示 -->
-          <span>{{ form.serviceFeeLimit }}万元</span>
+          <el-input v-model="form.serviceFeeLimit" placeholder="" readonly></el-input>
         </el-form-item>
         <el-form-item label="收款金额">
           <el-input v-model="form.paymentAmount" placeholder="请输入收款金额"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="submitForm('form')">保存</el-button>
-          <el-button @click="resetForm('form')">取消</el-button>
+          <el-button type="primary" @click="onSubmit('form')">保存</el-button>
+          <el-button @click="onCancel('form')">取消</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
diff --git a/fuintAdmin_zt/src/views/Site/components/before.vue b/fuintAdmin_zt/src/views/Site/components/before.vue
index 31ebd3f6f..0a58266c6 100644
--- a/fuintAdmin_zt/src/views/Site/components/before.vue
+++ b/fuintAdmin_zt/src/views/Site/components/before.vue
@@ -1,9 +1,17 @@
 <script>
+import {
+  addBeforeApi,
+  addBeforerApi,
+  getBeforeListApi,
+  getBeforerListApi, updateBeforeApi,
+  updateBeforerApi
+} from "@/api/system/Site/compant";
+
 export default {
   name: "beforeff",
   data() {
     return {
-
+      dialogVisible:false,
       tableData: [{
         price:2000,
         yprice:2500,
@@ -18,6 +26,7 @@ export default {
         deductionRate:'',
         estimatedTransactionVolume:'',
         remainingTransactionVolume:'',
+
       },
       form2: {
         form: {
@@ -33,21 +42,57 @@ export default {
   props: {
     deptId: String
   },
+  created() {
+    this.getList()
+  },
   methods: {
-
+    getList() {
+      getBeforeListApi({deptId : this.deptId}).then(res => {
+        this.tableData = res.data.records
+      })
+    },
     onCancel() {
       // 取消操作逻辑
       console.log('取消操作');
-    },
+      this.dialogVisible= false;
 
+    },
+    inputval() {
+      // if (
+      // )
+      let prepaidAmount = this.form.prepaidAmount;
+      let deductionRate = this.form.deductionRate / 1000;
+
+      if (!isNaN(prepaidAmount) && !isNaN(deductionRate)) {
+        let estimatedTransactionVolume = prepaidAmount / (1 - deductionRate);
+        let remainingTransactionVolume = estimatedTransactionVolume - prepaidAmount;
+
+        this.form.estimatedTransactionVolume = estimatedTransactionVolume;
+        this.form.remainingTransactionVolume = remainingTransactionVolume;
+      }
+
+    },
     onSubmit() {
       // 保存操作逻辑
       console.log('保存操作', this.form);
+      if (this.form.id) {
+        updateBeforeApi(this.form).then(res => {
+          this.getList();
+          this.dialogVisible = false;
+        })
+      }else {
+        addBeforeApi(this.form).then(res => {
+          this.getList();
+          this.dialogVisible= false;
+        })
+      }
     },
     handleUpdate1(){
-
+      this.dialogVisible=true
     },
-    handleEdit(){
+    handleEdit(data){
+      this.form = data
+      this.dialogVisible=true
 
     },
   }
@@ -61,7 +106,7 @@ export default {
     <el-table
       :data="tableData"
       border
-      style="width: 100%;margin-left: 55px ">
+      style="width: 90%;margin-left: 55px ">
       <el-table-column
         prop="prepaidAmount"
         align="center"
@@ -118,13 +163,13 @@ export default {
       width="30%">
       <el-form :model="form" label-width="150px">
         <el-form-item label="预付金额">
-          <el-input v-model="form.prepaidAmount" placeholder="请输入预付金额"></el-input>
+          <el-input @change="inputval" v-model="form.prepaidAmount" placeholder="请输入预付金额"></el-input>
         </el-form-item>
         <el-form-item label="扣点费率">
-          <el-input v-model="form.deductionRate" placeholder="请输入扣点费率" suffix-icon="el-icon-percent"></el-input>
+          <el-input @change="inputval" v-model="form.deductionRate" placeholder="请输入扣点费率‱" suffix-icon="el-icon-percent"></el-input>
         </el-form-item>
         <el-form-item label="预估交易流量">
-          <el-input v-model="form.estimatedTransactionVolume" placeholder="请输入预估交易流量" suffix-icon="el-icon-percent"></el-input>
+          <el-input v-model="form.estimatedTransactionVolume" placeholder="请输入预估交易流量" suffix-icon="el-icon-percent" readonly></el-input>
         </el-form-item>
         <el-form-item label="剩余交易流量">
           <el-input v-model="form.remainingTransactionVolume" placeholder="请输入剩余交易流量" suffix-icon="el-icon-percent" readonly></el-input>
diff --git a/fuintAdmin_zt/src/views/Site/components/yearff.vue b/fuintAdmin_zt/src/views/Site/components/yearff.vue
index 7675a5d7d..f2e7175a4 100644
--- a/fuintAdmin_zt/src/views/Site/components/yearff.vue
+++ b/fuintAdmin_zt/src/views/Site/components/yearff.vue
@@ -1,5 +1,6 @@
 <script>
 import {addYearApi, getYearListApi, updateYearApi} from "@/api/system/Site/compant";
+import {parseTime} from "@/utils/fuint";
 
 export default {
   name: "yearff",
@@ -36,9 +37,11 @@ export default {
     onSubmit() {
       console.log('表单提交', this.form);
       if (this.form.validDate) {
-        this.form.systemValidityPeriodStart = this.form.validDate[0]
-        this.form.systemValidityPeriodEnd = this.form.validDate[1]
+        this.form.systemValidityPeriodStart = parseTime(this.form.validDate[0])
+        this.form.systemValidityPeriodEnd = parseTime(this.form.validDate[1])
       }
+      // parseTime(this.form.systemValidityPeriodStart)
+      // parseTime(this.form.systemValidityPeriodEnd)
       console.log("123123")
       if (this.form.id) {
         updateYearApi(this.form).then(res => {
@@ -61,7 +64,10 @@ export default {
     },
     handleEdit(data) {
       this.form = data
-      this.dialogVisible=false
+      this.form.validDate = []
+      this.form.validDate.push(this.form.systemValidityPeriodStart)
+      this.form.validDate.push(this.form.systemValidityPeriodEnd)
+      this.dialogVisible=true
     },
     cal() {
       this.form= {
@@ -99,11 +105,17 @@ export default {
       prop="address"
       align="center"
       label="系统生效时间">
+      <template slot-scope="scope">
+        <span>{{parseTime(scope.row.systemValidityPeriodStart)}}-{{parseTime(scope.row.systemValidityPeriodEnd)}}</span>
+      </template>
     </el-table-column>
     <el-table-column
       prop="status"
       align="center"
       label="状态">
+      <template slot-scope="scope">
+        <span>{{scope.row.status?'已完成':'未完成'}}</span>
+      </template>
     </el-table-column>
     <el-table-column
       prop="createTime"
@@ -111,7 +123,7 @@ export default {
       label="创建时间">
     </el-table-column>
     <el-table-column
-      prop="createName"
+      prop="createBy"
       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 854693c25..bba7d733d 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -13,23 +13,23 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" style="width: 180px">
-          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="payChannel" style="width: 180px">
-          <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="" style="width: 180px">-->
+<!--          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="payChannel" style="width: 180px">-->
+<!--          <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" style="width: 180px">
           <el-select
-            v-model="queryParams.payType"
+            v-model="queryParams.paymentType"
             clearable
             placeholder="支付方式"
           >
@@ -98,11 +98,11 @@
               <span v-else>其他</span>
             </template>
           </el-table-column>
-          <el-table-column prop="payType" align="center" label="支付方式">
+          <el-table-column prop="paymentType" align="center" label="支付方式">
             <template slot-scope="scope">
-              <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-if="scope.row.paymentType=='CASH'">现金</span>
+              <span v-else-if="scope.row.paymentType=='WECHAT'">微信</span>
+              <span v-else-if="scope.row.paymentType=='ALIPAY'">支付宝</span>
               <span v-else="">余额</span>
             </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 fd5e33bee..ba1df5a4a 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
@@ -13,17 +13,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" style="width: 180px">
-          <el-input placeholder="请输入油号" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
+<!--        <el-form-item label="" style="width: 180px">-->
+<!--          <el-input placeholder="请输入油号" v-model="queryParams.orderNo"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item label="" prop="payChannel" style="width: 180px">
           <el-select
-            v-model="queryParams.payChannel"
+            v-model="queryParams.terminal"
             clearable
             placeholder="订单类型"
           >
             <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="cashier"/>
+            <el-option label="收银台" value="PC"/>
             <el-option label="POS端" value="POS"/>
           </el-select>
         </el-form-item>
@@ -39,9 +39,9 @@
             <el-option label="余额" value="balance"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="status" style="width: 180px">
+        <el-form-item label="" prop="orderStatus" style="width: 180px">
           <el-select
-            v-model="queryParams.status"
+            v-model="queryParams.orderStatus"
             clearable
             placeholder="支付状态"
           >
@@ -144,6 +144,7 @@
 <script>
 
 import {getDuiZhangOilListApi} from "@/api/financialStatement/jiaoyiduizhang";
+import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
   export default {
     name: "jiaoyiduizhang-oil",
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
index 1ff83975a..1b3793b66 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
@@ -13,17 +13,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" style="width: 180px">
-          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="payChannel" style="width: 180px">
+<!--        <el-form-item label="" style="width: 180px">-->
+<!--          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item label="" prop="terminal" style="width: 180px">
           <el-select
-            v-model="queryParams.payChannel"
+            v-model="queryParams.terminal"
             clearable
             placeholder="订单类型"
           >
             <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="cashier"/>
+            <el-option label="收银台" value="PC"/>
             <el-option label="POS端" value="POS"/>
           </el-select>
         </el-form-item>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index 46b930418..6ca26c8ca 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -22,9 +22,11 @@
             clearable
             placeholder="订单类型"
           >
-            <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="cashier"/>
-            <el-option label="POS端" value="POS"/>
+            <el-option label="充值卡" value="0"/>
+            <el-option label="其他" value="1"/>
+<!--            <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" style="width: 180px">
@@ -48,6 +50,7 @@
             <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>
         <el-form-item label="">
@@ -160,6 +163,7 @@
 <script>
 
 import {getDuiZhangVipListApi, getVipListApi} from "@/api/financialStatement/jiaoyiduizhang";
+import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
   export default {
     name: "jiaoyiduizhang-vip",
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 15eb71ec3..4739b0014 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -13,58 +13,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" style="width: 180px">
-          <el-input placeholder="请输入油号" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="payChannel" style="width: 180px">
-          <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" style="width: 180px">
-          <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" style="width: 180px">
-          <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 label="">
-          <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 class="" style="float: right;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index fb5584efe..605ff607e 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -13,61 +13,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" style="width: 180px">
-          <el-input placeholder="请输入商品名称" v-model="queryParams.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="payChannel" style="width: 180px">
-          <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" style="width: 180px">
-          <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" style="width: 180px">
-          <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 label="">
-          <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 class="" style="float: right;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index 42cf1d562..fbeb358e8 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -20,15 +20,10 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="" prop="appStatus">
-          <el-input
-            v-model="queryParams.appStatus"
-            placeholder="请选择小程序状态"
-            clearable
-            style="width: 240px;"
-            @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-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
                     <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
@@ -49,12 +44,13 @@
         <el-table-column prop="appId" label="小程序appID"></el-table-column>
         <el-table-column prop="appKey" label="密钥"></el-table-column>
         <el-table-column prop="legalRepresentativeName" label="法人姓名"></el-table-column>
-        <el-table-column prop="legalRepresentativeWeChat" label="法人微信号"></el-table-column>
+        <el-table-column prop="legalRepresentativeWechat" label="法人微信号"></el-table-column>
         <el-table-column prop="legalRepresentativeContact" label="法人联系方式"></el-table-column>
         <el-table-column prop="appStatus" label="小程序状态">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.appStatus"
+              @change="changeStatus(scope.row)"
               active-color="#13ce66"
               inactive-color="#ff4949">
             </el-switch>
@@ -114,18 +110,18 @@
           <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 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-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>
@@ -141,6 +137,7 @@
 
 
 import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
+import {updateBannerApi} from "@/api/sys/banner";
 
 export default {
   name: "printIndex",
@@ -155,7 +152,7 @@ export default {
         appId: '',   // 小程序appID
         appKey: '',   // 密钥
         legalRepresentativeName: '',   // 法人姓名
-        legalRepresentativeWeChat: '',   // 法人微信
+        legalRepresentativeWechat: '',   // 法人微信
         legalRepresentativeContact: '',   // 法人联系方式
         appStatus: false,   // 小程序状态
         createByName: '',
@@ -218,6 +215,19 @@ export default {
         })
       }
     },
+    changeStatus(data){
+      console.log(123123123)
+      updateAppApi(data).then(res=>{
+        if(res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: '修改状态成功!'
+          });
+          this.getList()
+        }
+
+      })
+    },
     handleQuery(){
       this.getList()
     },
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue
index a43b49168..430c05af6 100644
--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ b/fuintAdmin_zt/src/views/setting/banner/index.vue
@@ -25,13 +25,15 @@
           </el-form-item>
 
             <el-form-item label="" prop="bannerName">
-              <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">
-                <el-option
-                  v-for="item in systemPositionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
+              <el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
+                <el-option label="停用" value="0" ></el-option>
+                <el-option label="启用" value="1" ></el-option>
+<!--                <el-option-->
+<!--                  v-for="item in systemPositionList"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value">-->
+<!--                </el-option>-->
               </el-select>
             </el-form-item>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptPriceInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptPriceInfo.java
index 4c164f66a..3b7803044 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptPriceInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptPriceInfo.java
@@ -38,7 +38,7 @@ public class DeptPriceInfo extends BaseEntity {
 /**
      * 状态，布尔类型，不能为空
      */
-    private Integer status;
+    private Boolean status;
     private Integer deptId;
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptServiceFeeInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptServiceFeeInfo.java
index d1410f226..34f768985 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptServiceFeeInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptServiceFeeInfo.java
@@ -26,7 +26,7 @@ public class DeptServiceFeeInfo extends BaseEntity {
      */
     private Double paymentAmount;
 /**
-     * 易发生交易流量，最多10位数字，其中2位小数，不能为空
+     * 已发生交易流量，最多10位数字，其中2位小数，不能为空
      */
     private Double likelyTransactionVolume;
 /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptTransactionInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptTransactionInfo.java
index dae193adf..a0e39a8ee 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptTransactionInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/entity/DeptTransactionInfo.java
@@ -35,7 +35,7 @@ public class DeptTransactionInfo extends BaseEntity {
 /**
      * 状态，布尔类型，不能为空
      */
-    private Integer status;
+    private Boolean status;
     private Integer deptId;
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptServiceFeeInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptServiceFeeInfoMapper.java
index d7a728b85..572a6fde1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptServiceFeeInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptServiceFeeInfoMapper.java
@@ -30,7 +30,7 @@ public interface DeptServiceFeeInfoMapper {
      * @param page         分页对象
      * @return 对象列表
      */
-    IPage<DeptServiceFeeInfo> queryAllByLimit(@Param("page") Page page, DeptServiceFeeInfo deptServiceFeeInfo);
+    IPage<DeptServiceFeeInfo> queryAllByLimit(@Param("page") Page page, @Param("deptServiceFeeInfo") DeptServiceFeeInfo deptServiceFeeInfo);
 
     /**
      * 统计总行数
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptTransactionInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptTransactionInfoMapper.java
index b9bd43988..879a2f8bb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptTransactionInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptTransactionInfoMapper.java
@@ -30,7 +30,7 @@ public interface DeptTransactionInfoMapper {
      * @param page         分页对象
      * @return 对象列表
      */
-    IPage<DeptTransactionInfo> queryAllByLimit(@Param("page") Page page, DeptTransactionInfo deptTransactionInfo);
+    IPage<DeptTransactionInfo> queryAllByLimit(@Param("page") Page page, @Param("info") DeptTransactionInfo deptTransactionInfo);
 
     /**
      * 统计总行数
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptPriceInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptPriceInfoMapper.xml
index 54a76e7cf..bb438c74d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptPriceInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptPriceInfoMapper.xml
@@ -6,14 +6,18 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="price" column="price" jdbcType="NUMERIC"/>
         <result property="prepaidAmount" column="prepaid_amount" jdbcType="NUMERIC"/>
-        <result property="systemValidityPeriod" column="system_validity_period" jdbcType="INTEGER"/>
+        <result property="systemValidityPeriodStart" column="system_validity_period_start" jdbcType="DATE"/>
+        <result property="systemValidityPeriodEnd" column="system_validity_period_end" jdbcType="DATE"/>
+        <result property="createTime" column="create_time" jdbcType="DATE"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="DeptPriceInfoMap">
         select
-id,price,prepaid_amount,system_validity_period,status
+id,price,prepaid_amount,system_validity_period_start,system_validity_period_end,
+status,create_time,create_by
         from dept_price_info
         where id = #{id}
     </select>
@@ -21,7 +25,8 @@ id,price,prepaid_amount,system_validity_period,status
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="DeptPriceInfoMap">
         select
-id,price,prepaid_amount,system_validity_period_start,system_validity_period_end,status
+id,price,prepaid_amount,system_validity_period_start,system_validity_period_end,status,
+create_time,create_by
         from dept_price_info
         <where>
             <if test="info.id != null">
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 6127098e7..6ef790145 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
@@ -23,35 +23,34 @@ id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistic
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="DeptServiceFeeInfoMap">
         select
-id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistics,service_fee_limit,status
-
-
+id,deduction_rate,payment_amount,likely_transaction_volume,
+service_fee_statistics,service_fee_limit,status
         from dept_service_fee_info
         <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="deductionRate != null">
-                and deduction_rate = #{deductionRate}
-            </if>
-            <if test="paymentAmount != null">
-                and payment_amount = #{paymentAmount}
-            </if>
-            <if test="likelyTransactionVolume != null">
-                and likely_transaction_volume = #{likelyTransactionVolume}
-            </if>
-            <if test="serviceFeeStatistics != null">
-                and service_fee_statistics = #{serviceFeeStatistics}
-            </if>
-            <if test="serviceFeeLimit != null">
-                and service_fee_limit = #{serviceFeeLimit}
-            </if>
-            <if test="status != null">
-                and status = #{status}
-            </if>
+
         </where>
     </select>
-
+<!--    <if test="id != null">-->
+<!--        and id = #{id}-->
+<!--    </if>-->
+<!--    <if test="deductionRate != null">-->
+<!--        and deduction_rate = #{deductionRate}-->
+<!--    </if>-->
+<!--    <if test="paymentAmount != null">-->
+<!--        and payment_amount = #{paymentAmount}-->
+<!--    </if>-->
+<!--    <if test="likelyTransactionVolume != null">-->
+<!--        and likely_transaction_volume = #{likelyTransactionVolume}-->
+<!--    </if>-->
+<!--    <if test="serviceFeeStatistics != null">-->
+<!--        and service_fee_statistics = #{serviceFeeStatistics}-->
+<!--    </if>-->
+<!--    <if test="serviceFeeLimit != null">-->
+<!--        and service_fee_limit = #{serviceFeeLimit}-->
+<!--    </if>-->
+<!--    <if test="status != null">-->
+<!--        and status = #{status}-->
+<!--    </if>-->
     <!--统计总行数-->
     <select id="count" resultType="java.lang.Long">
         select count(1)
@@ -86,7 +85,7 @@ id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistic
         insert into dept_service_fee_info(deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistics,service_fee_limit,status
 
 )
-        values (#{deductionRate},#{paymentAmount},#{likelyTransactionVolume},#{serviceFeeStatistics},#{serviceFeeLimit}#{status})
+        values (#{deductionRate},#{paymentAmount},#{likelyTransactionVolume},#{serviceFeeStatistics},#{serviceFeeLimit},#{status})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptTransactionInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptTransactionInfoMapper.xml
index 5795a2935..6cb1db3f6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptTransactionInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptTransactionInfoMapper.xml
@@ -9,12 +9,15 @@
         <result property="estimatedTransactionVolume" column="estimated_transaction_volume" jdbcType="NUMERIC"/>
         <result property="remainingTransactionVolume" column="remaining_transaction_volume" jdbcType="NUMERIC"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="DATE"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="DeptTransactionInfoMap">
         select
-id,prepaid_amount,deduction_rate,estimated_transaction_volume,remaining_transaction_volume,status
+id,prepaid_amount,deduction_rate,estimated_transaction_volume,
+remaining_transaction_volume,status,create_time,create_by
         from dept_transaction_info
         where id = #{id}
     </select>
@@ -22,30 +25,31 @@ id,prepaid_amount,deduction_rate,estimated_transaction_volume,remaining_transact
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="DeptTransactionInfoMap">
         select
-        id,prepaid_amount,deduction_rate,estimated_transaction_volume,remaining_transaction_volume,status
+        id,prepaid_amount,deduction_rate,estimated_transaction_volume,
+        remaining_transaction_volume,status,create_time,create_by
         from dept_transaction_info
         <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="prepaidAmount != null">
-                and prepaid_amount = #{prepaidAmount}
-            </if>
-            <if test="deductionRate != null">
-                and deduction_rate = #{deductionRate}
-            </if>
-            <if test="estimatedTransactionVolume != null">
-                and estimated_transaction_volume = #{estimatedTransactionVolume}
-            </if>
-            <if test="remainingTransactionVolume != null">
-                and remaining_transaction_volume = #{remainingTransactionVolume}
-            </if>
-            <if test="status != null">
-                and status = #{status}
-            </if>
+
         </where>
     </select>
-
+<!--    <if test="info.id != null">-->
+<!--        and id = #{id}-->
+<!--    </if>-->
+<!--    <if test="prepaidAmount != null">-->
+<!--        and prepaid_amount = #{prepaidAmount}-->
+<!--    </if>-->
+<!--    <if test="deductionRate != null">-->
+<!--        and deduction_rate = #{deductionRate}-->
+<!--    </if>-->
+<!--    <if test="estimatedTransactionVolume != null">-->
+<!--        and estimated_transaction_volume = #{estimatedTransactionVolume}-->
+<!--    </if>-->
+<!--    <if test="remainingTransactionVolume != null">-->
+<!--        and remaining_transaction_volume = #{remainingTransactionVolume}-->
+<!--    </if>-->
+<!--    <if test="status != null">-->
+<!--        and status = #{status}-->
+<!--    </if>-->
     <!--统计总行数-->
     <select id="count" resultType="java.lang.Long">
         select count(1)
@@ -74,9 +78,9 @@ id,prepaid_amount,deduction_rate,estimated_transaction_volume,remaining_transact
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into dept_transaction_info(prepaid_amount,deduction_rate,estimated_transaction_volume,remaining_transaction_volume,status
+        insert into dept_transaction_info(prepaid_amount,deduction_rate,estimated_transaction_volume,remaining_transaction_volume,status,create_by
 )
-        values (#{prepaidAmount},#{deductionRate},#{estimatedTransactionVolume},#{remainingTransactionVolume},#{status})
+        values (#{prepaidAmount},#{deductionRate},#{estimatedTransactionVolume},#{remainingTransactionVolume},#{status},#{createBy})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
index 5510551c8..28c6c2901 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
@@ -59,7 +59,7 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
     @Override
     public DeptPriceInfo insert(DeptPriceInfo deptPriceInfo) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-//        deptPriceInfo.setStoreId(nowAccountInfo.getStoreId());
+        deptPriceInfo.setCreateBy(nowAccountInfo.getRealName());
         this.deptPriceInfoMapper.insert(deptPriceInfo);
         return deptPriceInfo;
     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptTransactionInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptTransactionInfoServiceImpl.java
index 811525626..1690fbaa1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptTransactionInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptTransactionInfoServiceImpl.java
@@ -59,7 +59,7 @@ public class DeptTransactionInfoServiceImpl implements DeptTransactionInfoServic
     @Override
     public DeptTransactionInfo insert(DeptTransactionInfo deptTransactionInfo) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-//        deptTransactionInfo.setStoreId(nowAccountInfo.getStoreId());
+        deptTransactionInfo.setCreateBy(nowAccountInfo.getRealName());
         this.deptTransactionInfoMapper.insert(deptTransactionInfo);
         return deptTransactionInfo;
     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
index 7e0ab11de..590c3706f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -227,6 +227,9 @@
             <if test="integralOrders.id != null">
                 and io.id = #{integralOrders.id}
             </if>
+            <if test="integralOrders.paymentType != null">
+                and io.payment_type = #{integralOrders.paymentType}
+            </if>
             <if test="integralOrders.userId != null">
                 and io.user_id = #{integralOrders.userId}
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
index 19a301bb8..5bb9439b7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
@@ -24,6 +24,24 @@
             resultType="com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders">
         <include refid="selectOrders"></include>
         <where>
+
+            <if test="order.staffMobile != null and order.staffMobile != ''">
+                and staff_mobile like concat('%', #{order.staffMobile}, '%')
+            </if>
+
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no like concat('%', #{order.orderNo}, '%')
+            </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
+            <if test="order.rechargeType != null and order.rechargeType != ''">
+                and recharge_type = #{order.rechargeType}
+            </if>
+
+            <if test="order.paymentType != null and order.paymentType != ''">
+                and payment_type = #{order.paymentType}
+            </if>
             <if test="order.status != null and order.status != ''">
                 and status = #{order.status}
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index 52cfcf9fc..8ad4786d2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -229,6 +229,12 @@
             <if test="order.userId != null and order.userId != ''">
                 and user_id = #{order.userId}
             </if>
+            <if test="order.status != null and order.status != ''">
+                and status = #{order.status}
+            </if>
+            <if test="order.terminal != null and order.terminal != ''">
+                and terminal = #{order.terminal}
+            </if>
             <if test="order.payType != null and order.payType != ''">
                 and pay_type = #{order.payType}
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index e831f3009..c4bd663d6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -54,6 +54,9 @@
             <if test="order.userId != null and order.userId != ''">
                 and user_id = #{order.userId}
             </if>
+            <if test="order.terminal != null and order.terminal != ''">
+                and terminal = #{order.terminal}
+            </if>
             <if test="order.staffId != null and order.staffId != ''">
                 and staff_id = #{order.staffId}
             </if>
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 cc7926e03..44afa2eec 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
@@ -9,6 +9,7 @@
         <result property="appId" column="app_id" jdbcType="VARCHAR"/>
         <result property="legalRepresentativeName" column="legal_representative_name" jdbcType="VARCHAR"/>
         <result property="legalRepresentativeId" column="legal_representative_id" jdbcType="VARCHAR"/>
+        <result property="legalRepresentativeWechat" column="legal_representative_wechat" jdbcType="VARCHAR"/>
         <result property="legalRepresentativeContact" column="legal_representative_contact" jdbcType="VARCHAR"/>
         <result property="appStatus" column="app_status" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="VARCHAR"/>
@@ -19,7 +20,7 @@
     <select id="queryById" resultMap="SysAppMap">
         select
 id,org_name,unified_social_credit_code,app_id,legal_representative_name,
-legal_representative_id,legal_representative_contact.app_status
+legal_representative_id,legal_representative_contact,app_status,app_key,legal_representative_wechat
         from sys_app
         where id = #{id}
     </select>
@@ -28,7 +29,7 @@ legal_representative_id,legal_representative_contact.app_status
     <select id="queryAllByLimit" resultMap="SysAppMap">
         select
 id,org_name,unified_social_credit_code,app_id,legal_representative_name,
-legal_representative_id,legal_representative_contact,app_status,create_time,create_by_name
+legal_representative_id,legal_representative_contact,app_status,create_time,create_by_name,app_key,legal_representative_wechat
         from sys_app
         <where>
             <if test="sysApp.id != null">
@@ -154,11 +155,11 @@ org_name = values(org_name)unified_social_credit_code = values(unified_social_cr
             <if test="legalRepresentativeContact != null and legalRepresentativeContact != ''">
                 legal_representative_contact = #{legalRepresentativeContact},
             </if>
-            <if test="legalRepresentativeContact != null">
-                legal_representative_wechat = #{legalRepresentativeWeChat},
+            <if test="legalRepresentativeWechat != null">
+                legal_representative_wechat = #{legalRepresentativeWechat},
             </if>
-            <if test="key != null and key != ''">
-                key = #{key},
+            <if test="appKey != null and appKey != ''">
+                app_key = #{appKey},
             </if>
             <if test="appStatus != null">
                 app_status = #{appStatus},