diff --git a/src/api/form.js b/src/api/form.js
index a479b38..53a394e 100644
--- a/src/api/form.js
+++ b/src/api/form.js
@@ -245,4 +245,26 @@ export const payRecordRecharge = {
         params: query,
       })
     },
+  }
+
+  /**
+ * 商户代付订单管理
+ */
+ export const paymentDaiFuRecord = {
+    // 查询商户代付订单管理
+    listInfo: (query) => {
+      return request({
+        url: '/order/PaymentRecord/list',
+        method: 'get',
+        params: query,
+      })
+    },
+    // 导出商户代付订单管理
+    exportList: (query) => {
+      return request({
+        url: '/order/PaymentRecord/export',
+        method: 'get',
+        params: query,
+      })
+    },
   }
\ No newline at end of file
diff --git a/src/views/otc/otcFinance/index.vue b/src/views/otc/otcFinance/index.vue
index 7c00eb3..12b4ef7 100644
--- a/src/views/otc/otcFinance/index.vue
+++ b/src/views/otc/otcFinance/index.vue
@@ -47,19 +47,18 @@
         </el-row>
 
         <el-table v-loading="loading" :data="otcCoinList">
-            <el-table-column label="商户id" align="center" prop="merchantId" />
             <el-table-column label="账户名" align="center" prop="accountName" />
             <el-table-column label="商户订单号" align="center" prop="merchantOrderNo" />
             <el-table-column label="业务单号" align="center" prop="businessNo" />
 
             <el-table-column :label="'变动金额'" align="center" prop="changeAmount">
                 <template slot-scope="scope">
-                    {{ (NumberDiv(scope.row.changeAmount, 100)) }}
+                    {{ scope.row.changeAmount }}
                 </template>
             </el-table-column>
             <el-table-column :label="'变动后余额'" align="center" prop="afterBalance">
                 <template slot-scope="scope">
-                    {{ (NumberDiv(scope.row.afterBalance, 100)) }}
+                    {{ scope.row.afterBalance }}
                 </template>
             </el-table-column>
 
@@ -70,12 +69,7 @@
 
             <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
 
-            <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <el-button size="small" type="text" style="color: #006EFF;" v-if="scope.row.orderStatus == 1"
-                        @click="handleOrder(scope.row)">手工处理</el-button>
-                </template>
-            </el-table-column> -->
+          
         </el-table>
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -150,27 +144,10 @@ export default {
         });
     },
     methods: {
-        init() {
-
-        },
-        /** 手工处理 */
-        handleOrder(row) {
-            this.reset()
-            this.form = row
-            this.open = true
-        },
         /** 查询OTC币种列表 */
         getList() {
             this.loading = true;
-            let queryParams = {
-                pageNum: this.queryParams.pageNum,
-                pageSize: this.queryParams.pageSize,
-                accountName: this.queryParams.accountName,
-                source: this.queryParams.source,
-                opType: this.queryParams.opType,
-                amountType: this.queryParams.amountType,
-            }
-            merchantWalletLog.listInfo(this.addSESDateRange(queryParams, this.dateRange)).then(response => {
+            merchantWalletLog.listInfo(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
                 this.otcCoinList = response.rows;
                 this.total = Number(response.total);
                 this.loading = false;
@@ -200,8 +177,6 @@ export default {
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
-            // let changeAmount;
-            // this.queryParams.changeAmount ? changeAmount = this.NumberMul(this.queryParams.changeAmount, 100) : changeAmount = null
             this.getList();
         },
         /** 重置按钮操作 */
diff --git a/src/views/otc/otcStore/index.vue b/src/views/otc/otcStore/index.vue
index d8605f6..5c0e2eb 100644
--- a/src/views/otc/otcStore/index.vue
+++ b/src/views/otc/otcStore/index.vue
@@ -33,39 +33,27 @@
         <div class="bg">
             <el-table stripe :data="infoList" v-loading="loading">
                 <el-table-column label="商户名称" align="center" prop="username" />
-                <el-table-column label="商户ID" align="center" prop="merchantNo" />
+                <el-table-column label="商户编号" align="center" prop="merchantNo" />
 
 
 
                 <el-table-column :label="'余额'" align="center" prop="balance">
                     <template slot-scope="scope">
-                        {{ parseFloat(NumberDiv(scope.row.balance, 100)).toFixed(2) }}
+                        {{ scope.row.balance }}
                     </template>
                 </el-table-column>
 
                 <el-table-column :label="'冻结金额'" align="center" prop="frozenAmount">
                     <template slot-scope="scope">
-                        {{ parseFloat(NumberDiv(scope.row.frozenAmount, 100)).toFixed(2) }}
+                        {{ scope.row.frozenAmount }}
                     </template>
                 </el-table-column>
 
-                <el-table-column :label="'可申请金额'" align="center" prop="applicableAmount">
-                    <template slot-scope="scope">
-                        {{ parseFloat(NumberDiv(scope.row.applicableAmount, 100)).toFixed(2) }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column :label="'押金'" align="center" prop="securityDepositAmount">
-                    <template slot-scope="scope">
-                        {{ parseFloat(NumberDiv(scope.row.securityDepositAmount, 100)).toFixed(2) }}
-                    </template>
-                </el-table-column>
 
                 <el-table-column label="状态" align="center" prop="status" width="140px">
                     <template slot-scope="scope">
                         <el-switch v-model="scope.row.status" active-text="开" inactive-text="关" :active-value="1"
-                            :inactive-value="0" @change="switchStatusChange(scope.row, 'status')"
-                            v-hasPermi="['system:merchant:edit']">
+                            :inactive-value="0" @change="switchStatusChange(scope.row, 'status')">
                         </el-switch>
                     </template>
                 </el-table-column>
@@ -93,23 +81,23 @@
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
                     min-width="200">
                     <template slot-scope="scope">
-                        <el-button size="small" type="text" @click="handleDeleteMer(scope.row)" style="color: #006eff"
-                            v-hasPermi="['system:merchant:del']">商户删除</el-button>
+                        <el-button size="small" type="text" @click="handleDeleteMer(scope.row)"
+                            style="color: #006eff">商户删除</el-button>
                         <!-- <el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff"
                             v-hasPermi="['system:merchantChannel:getChannel']">通道</el-button> -->
                         <!-- <el-button size="small" type="text" @click="handleWithdraw(scope.row)" style="color: #006eff">提现</el-button> -->
                         <el-button size="small" type="text" @click="handlePassword(scope.row, 'loginPassword')"
-                            style="color: #006eff" v-hasPermi="['system:merchant:editLoginPwd']">登录密码</el-button>
+                            style="color: #006eff">登录密码</el-button>
                         <el-button size="small" type="text" @click="handlePassword(scope.row, 'payPassword')"
-                            style="color: #006eff" v-hasPermi="['system:merchant:editPayPwd']">支付密码</el-button>
+                            style="color: #006eff">支付密码</el-button>
 
-                        <el-button size="small" type="text" @click="handleBalance(scope.row)" style="color: #006eff"
-                            v-hasPermi="['system:merchant:operatingBalance']">余额</el-button>
+                        <el-button size="small" type="text" @click="handleBalance(scope.row)"
+                            style="color: #006eff">余额</el-button>
 
-                        <el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff"
-                            v-hasPermi="['system:merchant:edit']">编辑</el-button>
-                        <el-button size="small" type="text" @click="handleControl(scope.row)" style="color: #006eff"
-                            v-hasPermi="['system:merchant:getMerchantWindControl']">风控</el-button>
+                        <el-button size="small" type="text" @click="handleUpdate(scope.row)"
+                            style="color: #006eff">编辑</el-button>
+                        <el-button size="small" type="text" @click="handleControl(scope.row)"
+                            style="color: #006eff">风控</el-button>
 
                         <el-button size="small" type="text" @click="handleUpdateRate(scope.row)"
                             style="color: #006eff">费率</el-button>
@@ -262,20 +250,20 @@
         </el-dialog>
 
         <!-- 提现 -->
-        <el-dialog :title="title" :visible.sync="openWithdraw" width="500px" append-to-body>
+        <!-- <el-dialog :title="title" :visible.sync="openWithdraw" width="500px" append-to-body>
             <el-form ref="formWithdraw" :model="form" :rules="rules" label-width="140px">
-                <!-- <el-form-item label="规则" prop="rateRuleType">
+                <el-form-item label="规则" prop="rateRuleType">
             <el-select v-model="form.rateRuleType" placeholder="请选择规则" clearable size="medium" @change="getValue">
               <el-option v-for="(item, i) in withdrawRule" :key="i" :label="item.label" :value="item.value"></el-option>
             </el-select>
-          </el-form-item> -->
-                <!-- <el-form-item label="单笔提款比例" prop="rate">
+          </el-form-item>
+              <el-form-item label="单笔提款比例" prop="rate">
             <el-input v-model="form.rate" placeholder="请输入单笔提款比例" style="width:300px" @input="change" :disabled="true" /> %
           </el-form-item>
           <el-form-item label="单笔提款收取" prop="singleFee">
             <el-input v-model="form.singleFee" placeholder="请输入单笔提款收取" style="width:300px" @input="change"
               :disabled="true" />
-          </el-form-item> -->
+          </el-form-item>
                 <el-form-item label="是否允许后台提现" prop="paymentManualStatus">
                     <el-switch v-model="form.paymentManualStatus" active-text="是" inactive-text="否" :active-value=true
                         :inactive-value=false></el-switch>
@@ -289,7 +277,7 @@
                 <el-button type="primary" @click="submitForm('formWithdraw')">保 存</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
-        </el-dialog>
+        </el-dialog> -->
 
         <!-- 风控 -->
         <el-dialog :title="title" :visible.sync="openControl" width="800px" append-to-body>
@@ -355,7 +343,7 @@
         <el-dialog :title="title" :visible.sync="openRate" width="500px" append-to-body>
             <el-form ref="formRate" :model="form" :rules="rules" label-width="140px">
                 <el-form-item label="上级出金单笔比例" prop="" v-if="form.pMerchantPayOut">
-                    {{ form.pMerchantPayIn.merchantRate }} %
+                    {{ form.pMerchantPayOut.merchantRate }} %
                 </el-form-item>
                 <el-form-item label="下级出金单笔比例" prop="" v-if="form.merchantPayOut">
                     <el-input v-model="form.merchantPayOut.merchantRate" placeholder="请输入比例" style="width:300px"
@@ -363,7 +351,7 @@
                 </el-form-item>
 
                 <el-form-item label="上级入金单笔比例" prop="" v-if="form.pMerchantPayIn">
-                    {{ form.pMerchantPayOut.merchantRate }} %
+                    {{ form.pMerchantPayIn.merchantRate }} %
                 </el-form-item>
                 <el-form-item label="下级入金单笔比例" prop="" v-if="form.merchantPayIn">
                     <el-input v-model="form.merchantPayIn.merchantRate" placeholder="请输入比例" style="width:300px"
@@ -371,7 +359,7 @@
                 </el-form-item>
 
                 <el-form-item label="上级入金单笔收取" prop="" v-if="form.pMerchantPayIn">
-                    {{ NumberDiv(form.pMerchantPayIn.merchantSingle,100) }}
+                    {{ form.pMerchantPayIn.merchantSingle }}
                 </el-form-item>
                 <el-form-item label="下级出金单笔收取" prop="" v-if="form.merchantPayOut">
                     <el-input v-model="form.merchantPayOut.merchantSingle" placeholder="请输入单笔提款收取" style="width:300px"
@@ -379,16 +367,16 @@
                 </el-form-item>
 
                 <el-form-item label="上级出金单笔收取" prop="" v-if="form.pMerchantPayOut">
-                    {{ NumberDiv(form.pMerchantPayOut.merchantSingle,100) }}
+                    {{ form.pMerchantPayOut.merchantSingle }}
                 </el-form-item>
                 <el-form-item label="下级入金单笔收取" prop="" v-if="form.merchantPayIn">
                     <el-input v-model="form.merchantPayIn.merchantSingle" placeholder="请输入单笔提款收取" style="width:300px"
                         @input="change" />
                 </el-form-item>
-           
-              
-           
-            
+
+
+
+
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm('formRate')">保 存</el-button>
@@ -530,12 +518,16 @@ export default {
             this.reset();
             payMerchant.getRate(row.id).then((response) => {
                 this.form = response.data;
-                this.form.merchantPayIn.merchantSingle = this.NumberDiv(this.form.merchantPayIn.merchantSingle, 100)
-                this.form.merchantPayOut.merchantSingle = this.NumberDiv(this.form.merchantPayOut.merchantSingle, 100)
-
+                this.form.merchantPayIn.merchantSingle = this.form.merchantPayIn.merchantSingle
+                this.form.merchantPayOut.merchantSingle = this.form.merchantPayOut.merchantSingle
                 this.form.merchantPayIn.merchantRate = this.NumberMul(this.form.merchantPayIn.merchantRate, 100)
                 this.form.merchantPayOut.merchantRate = this.NumberMul(this.form.merchantPayOut.merchantRate, 100)
-
+                if (this.form.pMerchantPayIn) {
+                    this.form.pMerchantPayIn.merchantRate = this.NumberMul(this.form.pMerchantPayIn.merchantRate, 100)
+                }
+                if (this.form.pMerchantPayOut) {
+                    this.form.pMerchantPayOut.merchantRate = this.NumberMul(this.form.pMerchantPayOut.merchantRate, 100)
+                }
                 this.form.merchantId = row.id
                 this.title = "费率";
                 this.openRate = true;
@@ -567,21 +559,21 @@ export default {
         change() {
             this.$forceUpdate()
         },
-        getValue(e) {
-            payMerchant.getWithdrawConfig(this.id).then((response) => {
-                if (e == 2) {
-                    this.form.id = response.data.id
-                    this.form.merchantId = response.data.merchantId
-                    this.form.singleFee = response.data.sysMerchantWithdrawConfig.singleFee
-                    this.form.rate = response.data.sysMerchantWithdrawConfig.rate
-                } else {
-                    this.form.merchantId = response.data.merchantId
-                    this.form.singleFee = response.data.singleFee
-                    this.form.rate = response.data.rate
-                }
-            });
-            this.$forceUpdate()
-        },
+        // getValue(e) {
+        //     payMerchant.getWithdrawConfig(this.id).then((response) => {
+        //         if (e == 2) {
+        //             this.form.id = response.data.id
+        //             this.form.merchantId = response.data.merchantId
+        //             this.form.singleFee = response.data.sysMerchantWithdrawConfig.singleFee
+        //             this.form.rate = response.data.sysMerchantWithdrawConfig.rate
+        //         } else {
+        //             this.form.merchantId = response.data.merchantId
+        //             this.form.singleFee = response.data.singleFee
+        //             this.form.rate = response.data.rate
+        //         }
+        //     });
+        //     this.$forceUpdate()
+        // },
         // 状态有效无效
         switchStatusChange(row, type) {
             this.reset()
@@ -644,12 +636,6 @@ export default {
             this.dateRange = [];
             this.handleQuery();
         },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map((item) => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
-        },
         /** 新增按钮操作 */
         handleAdd(row, t) {
             this.reset();
@@ -658,26 +644,25 @@ export default {
             t == 'next' ? this.form.parentId = row.id : ''
         },
         // 提现
-        handleWithdraw(row) {
-            this.reset();
-            this.id = row.id
-            payMerchant.getWithdrawConfig(this.id).then((response) => {
-                this.form = response.data;
-                // 系统规则赋值不同
-                // if (this.form.rateRuleType == 2) {
-                //   this.form = response.data.sysMerchantWithdrawConfig
-                //   this.form.rateRuleType = response.data.rateRuleType
-                //   this.form.id = response.data.id
-                //   this.form.merchantId = response.data.merchantId
-                // }
-                // if (this.form.id == 0) {
-                //   this.form.id = null
-                // }
-                this.title = "提现";
-                this.openWithdraw = true;
-            });
-
-        },
+        // handleWithdraw(row) {
+        //     this.reset();
+        //     this.id = row.id
+        //     payMerchant.getWithdrawConfig(this.id).then((response) => {
+        //         this.form = response.data;
+        //         // 系统规则赋值不同
+        //         // if (this.form.rateRuleType == 2) {
+        //         //   this.form = response.data.sysMerchantWithdrawConfig
+        //         //   this.form.rateRuleType = response.data.rateRuleType
+        //         //   this.form.id = response.data.id
+        //         //   this.form.merchantId = response.data.merchantId
+        //         // }
+        //         // if (this.form.id == 0) {
+        //         //   this.form.id = null
+        //         // }
+        //         this.title = "提现";
+        //         this.openWithdraw = true;
+        //     });
+        // },
         // 修改密码
         handlePassword(row, type) {
             this.reset();
@@ -774,16 +759,14 @@ export default {
                     if (valid) {
                         if (type == "formRate") {
                             //  修改费率
-                            let merchantSingleIn = this.NumberMul(this.form.merchantPayIn.merchantSingle, 100)
-                            let merchantSingleOut = this.NumberMul(this.form.merchantPayOut.merchantSingle, 100)
                             let inMerchantRate = this.NumberDiv(this.form.merchantPayIn.merchantRate, 100)
                             let outMerchantRate = this.NumberDiv(this.form.merchantPayOut.merchantRate, 100)
                             payMerchant.setRate({
                                 inMerchantRate: inMerchantRate,
-                                inMerchantSingle: merchantSingleIn,
+                                inMerchantSingle: this.form.merchantPayIn.merchantSingle,
                                 merchantId: this.form.merchantId,
                                 outMerchantRate: outMerchantRate,
-                                outMerchantSingle: merchantSingleOut
+                                outMerchantSingle: this.form.merchantPayOut.merchantSingle
                             }).then((response) => {
                                 this.msgSuccess("操作成功");
                                 this.openRate = false;
@@ -839,25 +822,25 @@ export default {
                             });
                         }
                         // 提现
-                        if (type == "formWithdraw") {
-                            let singleFee;
-                            if (this.form.singleFee) {
-                                singleFee = this.NumberMul(this.form.singleFee, 100)
-                            }
-                            payMerchant.upWithdrawConfig({
-                                id: this.form.id,
-                                singleFee: singleFee,
-                                merchantId: this.form.merchantId,
-                                rate: this.form.rate,
-                                rateRuleType: this.form.rateRuleType,
-                                paymentManualStatus: this.form.paymentManualStatus,
-                                paymentInterfaceStatus: this.form.paymentInterfaceStatus
-                            }).then((response) => {
-                                this.msgSuccess("操作成功");
-                                this.openWithdraw = false;
-                                this.getList();
-                            });
-                        }
+                        // if (type == "formWithdraw") {
+                        //     let singleFee;
+                        //     if (this.form.singleFee) {
+                        //         singleFee = this.NumberMul(this.form.singleFee, 100)
+                        //     }
+                        //     payMerchant.upWithdrawConfig({
+                        //         id: this.form.id,
+                        //         singleFee: singleFee,
+                        //         merchantId: this.form.merchantId,
+                        //         rate: this.form.rate,
+                        //         rateRuleType: this.form.rateRuleType,
+                        //         paymentManualStatus: this.form.paymentManualStatus,
+                        //         paymentInterfaceStatus: this.form.paymentInterfaceStatus
+                        //     }).then((response) => {
+                        //         this.msgSuccess("操作成功");
+                        //         this.openWithdraw = false;
+                        //         this.getList();
+                        //     });
+                        // }
                         // 重置密码
                         if (type == "formPassword") {
                             if (this.ipType == "loginPassword") {
diff --git a/src/views/otc/otcStoreDaiFuOrder/index.vue b/src/views/otc/otcStoreDaiFuOrder/index.vue
new file mode 100644
index 0000000..898249f
--- /dev/null
+++ b/src/views/otc/otcStoreDaiFuOrder/index.vue
@@ -0,0 +1,228 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="116px"
+            class="flex form" style="position: relative">
+            <el-form-item label="平台订单号" prop="noOrder">
+                <el-input size="medium" v-model="queryParams.noOrder" placeholder="请输入平台订单号"
+                    @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+            <el-form-item label="商户订单号" prop="merchantOrderNo">
+                <el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
+                    @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+            <el-form-item label="收款卡号" prop="cardNumber">
+                <el-input size="medium" v-model="queryParams.cardNumber" placeholder="请输入收款卡号"
+                    @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+            <el-form-item label="商户名称" prop="merchantName">
+                <el-input size="medium" v-model="queryParams.merchantName" placeholder="请输入商户名称"
+                    @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+            <el-form-item label="开户名" prop="accountName">
+                <el-input size="medium" v-model="queryParams.accountName" placeholder="请输入开户名"
+                    @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+            <el-form-item label="代付金额" prop="tranAmt">
+                <el-input size="medium" v-model="queryParams.tranAmt" placeholder="请输入代付金额"
+                    @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+            <el-form-item label="批次号" prop="batchNo">
+                <el-input size="medium" v-model="queryParams.batchNo" placeholder="请输入批次号" @keyup.enter.native="handleQuery"
+                    style="width: 180px; border-color: #e6f1ff" />
+            </el-form-item>
+
+            <el-form-item label="订单状态" prop="orderStatus">
+                <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="small">
+                    <el-option v-for="dict in sysOrderStatus" :key="dict.dictValue" :label="dict.dictLabel"
+                        :value="dict.dictValue" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="创建时间">
+                <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                    :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
+
+            <el-table-column label="平台订单号" align="center" prop="noOrder" />
+
+            <el-table-column label="商户订单号" align="center" prop="outTradeNo" />
+            <el-table-column label="商户" align="center" prop="merchantName" />
+            <el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
+            <el-table-column :label="'代付金额'" align="center" prop="tranAmt">
+                <template slot-scope="scope">
+                    {{ scope.row.tranAmt }}
+                </template>
+            </el-table-column>
+
+            <el-table-column :label="'商户手续费'" align="center" prop="merchantFee">
+                <template slot-scope="scope">
+                    {{ scope.row.merchantFee }}
+                </template>
+            </el-table-column>
+
+            <el-table-column :label="'商户单笔手续费'" align="center" prop="merchantSingleFee">
+                <template slot-scope="scope">
+                    {{ scope.row.merchantSingleFee }}
+                </template>
+            </el-table-column>
+            <el-table-column :label="'商户费率（%）'" align="center" prop="merchantSingleFee">
+                <template slot-scope="scope">
+                    {{ parseFloat(NumberMul(scope.row.merchantRate, 100)).toFixed(2) }}
+                </template>
+            </el-table-column>
+            <el-table-column label="银行名称" align="center" prop="bankName" />
+            <el-table-column label="卡号" align="center" prop="cardNumber" />
+            <el-table-column label="开户名" align="center" prop="accountName" />
+            <el-table-column label="开户行" align="center" prop="branchName" />
+            <el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="sysOrderStatusFormat" />
+            <!-- <el-table-column label="异步通知状态" align="center" prop="notifyStatus" :formatter="notifyStatusFormat" /> -->
+
+            <el-table-column label="备注" align="center" prop="orderMsg" />
+
+
+            <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
+            <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" />
+
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
+
+
+
+
+    </div>
+</template>
+  
+<script>
+import { paymentDaiFuRecord, common_api } from "@/api/form";
+export default {
+    name: "otcStoreDaiFuOrder",
+    components: {
+    },
+    data() {
+        return {
+            dateRange: [],
+            sysOrderStatus: [],
+            notifyStatusOptions: [],
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // OTC币种表格数据
+            otcCoinList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            openTest: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                noOrder: null,
+                merchantOrderNo: null,
+                cardNumber: null,
+                merchantName: null,
+                accountName: null,
+                tranAmt: null,
+                orderStatus: null,
+                batchNo: null
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            },
+        };
+    },
+    created() {
+        this.getList();
+
+        this.getDicts("d_order_status").then(response => {
+            this.sysOrderStatus = response.data;
+        });
+        this.getDicts("notify_status").then(response => {
+            this.notifyStatusOptions = response.data;
+        });
+    },
+    methods: {
+        getList() {
+            this.loading = true;
+            paymentDaiFuRecord.listInfo(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
+                this.otcCoinList = response.rows;
+                this.total = Number(response.total);
+                this.loading = false;
+            });
+        },
+
+        sysOrderStatusFormat(row, column) {
+            return this.selectDictLabel(this.sysOrderStatus, row.orderStatus);
+        },
+        notifyStatusFormat(row, column) {
+            return this.selectDictLabel(this.notifyStatusOptions, row.notifyStatus);
+        },
+
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.openTest = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            const queryParams = this.queryParams;
+            this.$confirm('是否确认导出所有数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return paymentDaiFuRecord.exportList(queryParams);
+            }).then(response => {
+                this.download(response.msg);
+            })
+        }
+    }
+};
+</script>
+  
\ No newline at end of file
diff --git a/src/views/otc/otcStoreRechargeOrder/index.vue b/src/views/otc/otcStoreRechargeOrder/index.vue
index b28d888..0108a6e 100644
--- a/src/views/otc/otcStoreRechargeOrder/index.vue
+++ b/src/views/otc/otcStoreRechargeOrder/index.vue
@@ -23,6 +23,7 @@
                 <el-input v-model="queryParams.tranAmt" placeholder="请输入订单金额" clearable size="small"
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
+
             <el-form-item label="订单状态" prop="orderStatus">
                 <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="small">
                     <el-option v-for="dict in sysOrderStatus" :key="dict.dictValue" :label="dict.dictLabel"
@@ -63,21 +64,25 @@
             <el-table-column label="商户编号" align="center" prop="merchantNo" />
             <el-table-column :label="'订单金额'" align="center" prop="tranAmt">
                 <template slot-scope="scope">
-                    {{ (NumberDiv(scope.row.tranAmt, 100)) }}
+                    {{ scope.row.tranAmt }}
                 </template>
             </el-table-column>
             <el-table-column :label="'实付金额'" align="center" prop="payAmt">
                 <template slot-scope="scope">
-                    {{ (NumberDiv(scope.row.payAmt, 100)) }}
+                    {{ scope.row.payAmt }}
                 </template>
             </el-table-column>
             <el-table-column label="地址" align="center" prop="address" />
             <el-table-column label="付款地址" align="center" prop="payAddress" />
             <el-table-column label="支付商户名" align="center" prop="merchantName" />
-            <el-table-column label="商户费率（%）" align="center" prop="merchantRate" />
+            <el-table-column :label="'商户费率（%）'" align="center" prop="merchantSingleFee">
+                <template slot-scope="scope">
+                    {{ parseFloat(NumberMul(scope.row.merchantRate, 100)).toFixed(2) }}
+                </template>
+            </el-table-column>
             <el-table-column :label="'商户单笔手续费'" align="center" prop="merchantSingleFee">
                 <template slot-scope="scope">
-                    {{ (NumberDiv(scope.row.merchantSingleFee, 100)) }}
+                    {{ scope.row.merchantSingleFee }}
                 </template>
             </el-table-column>
             <el-table-column label="异步通知状态" align="center" prop="notifyStatus" :formatter="notifyStatusFormat" />
@@ -245,19 +250,9 @@ export default {
             this.open = true
         },
         /** 查询OTC币种列表 */
-        getList(v) {
+        getList() {
             this.loading = true;
-            let queryParams = {
-                pageNum: this.queryParams.pageNum,
-                pageSize: this.queryParams.pageSize,
-                orderNo: this.queryParams.orderNo,
-                outTradeNo: this.queryParams.outTradeNo,
-                payAddress: this.queryParams.payAddress,
-                merchantName: this.queryParams.merchantName,
-                tranAmt: v,
-                orderStatus: this.queryParams.orderStatus,
-            }
-            payRecordRecharge.listInfo(this.addSESDateRange(queryParams, this.dateRange)).then(response => {
+            payRecordRecharge.listInfo(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
                 this.otcCoinList = response.rows;
                 this.total = Number(response.total);
                 this.loading = false;
@@ -287,9 +282,7 @@ export default {
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
-            let tranAmt;
-            this.queryParams.tranAmt ? tranAmt = this.NumberMul(this.queryParams.tranAmt, 100) : tranAmt = null
-            this.getList(tranAmt);
+            this.getList();
         },
         /** 重置按钮操作 */
         resetQuery() {
@@ -302,11 +295,7 @@ export default {
             this.$refs[f].validate(valid => {
                 if (valid) {
                     if (t == 'test') {
-                        let amount = this.NumberMul(this.form.amount, 100)
-                        payRecordRecharge.recharge({
-                            amount: amount,
-                            merchantId: this.form.merchantId
-                        }).then((response) => {
+                        payRecordRecharge.recharge(this.form).then((response) => {
                             this.openTest = false;
                             this.msgSuccess("操作成功");
                             this.getList();