参照新梳理内容进行修改

src/api/business/dealCashout.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询提现列表
-export function listDealCashout(query) {
-  return request({
-    url: '/business/dealCashout/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询提现详细
-export function getDealCashout(id) {
-  return request({
-    url: '/business/dealCashout/' + id,
-    method: 'get'
-  })
-}
-
-// 新增提现
-export function addDealCashout(data) {
-  return request({
-    url: '/business/dealCashout',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改提现
-export function updateDealCashout(data) {
-  return request({
-    url: '/business/dealCashout',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除提现
-export function delDealCashout(id) {
-  return request({
-    url: '/business/dealCashout/' + id,
-    method: 'delete'
-  })
-}

src/api/business/dealPay.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询付款列表
-export function listDealPay(query) {
-  return request({
-    url: '/business/dealPay/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询付款详细
-export function getDealPay(id) {
-  return request({
-    url: '/business/dealPay/' + id,
-    method: 'get'
-  })
-}
-
-// 新增付款
-export function addDealPay(data) {
-  return request({
-    url: '/business/dealPay',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改付款
-export function updateDealPay(data) {
-  return request({
-    url: '/business/dealPay',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除付款
-export function delDealPay(id) {
-  return request({
-    url: '/business/dealPay/' + id,
-    method: 'delete'
-  })
-}

src/api/business/dealReceive.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询收款列表
-export function listDealReceive(query) {
-  return request({
-    url: '/business/dealReceive/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询收款详细
-export function getDealReceive(id) {
-  return request({
-    url: '/business/dealReceive/' + id,
-    method: 'get'
-  })
-}
-
-// 新增收款
-export function addDealReceive(data) {
-  return request({
-    url: '/business/dealReceive',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改收款
-export function updateDealReceive(data) {
-  return request({
-    url: '/business/dealReceive',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除收款
-export function delDealReceive(id) {
-  return request({
-    url: '/business/dealReceive/' + id,
-    method: 'delete'
-  })
-}

src/api/business/dealTopUp.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询充值列表
-export function listDealTopUp(query) {
-  return request({
-    url: '/business/dealTopUp/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询充值详细
-export function getDealTopUp(id) {
-  return request({
-    url: '/business/dealTopUp/' + id,
-    method: 'get'
-  })
-}
-
-// 新增充值
-export function addDealTopUp(data) {
-  return request({
-    url: '/business/dealTopUp',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改充值
-export function updateDealTopUp(data) {
-  return request({
-    url: '/business/dealTopUp',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除充值
-export function delDealTopUp(id) {
-  return request({
-    url: '/business/dealTopUp/' + id,
-    method: 'delete'
-  })
-}

src/api/business/recordPayCallback.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支付回执列表
+export function listRecordPayCallback(query) {
+  return request({
+    url: '/business/recordPayCallback/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支付回执详细
+export function getRecordPayCallback(id) {
+  return request({
+    url: '/business/recordPayCallback/' + id,
+    method: 'get'
+  })
+}
+
+// 新增支付回执
+export function addRecordPayCallback(data) {
+  return request({
+    url: '/business/recordPayCallback',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支付回执
+export function updateRecordPayCallback(data) {
+  return request({
+    url: '/business/recordPayCallback',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支付回执
+export function delRecordPayCallback(id) {
+  return request({
+    url: '/business/recordPayCallback/' + id,
+    method: 'delete'
+  })
+}

src/api/business/recordPaymentReceipt.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询支付回执列表
-export function listRecordPaymentReceipt(query) {
-  return request({
-    url: '/business/recordPaymentReceipt/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询支付回执详细
-export function getRecordPaymentReceipt(id) {
-  return request({
-    url: '/business/recordPaymentReceipt/' + id,
-    method: 'get'
-  })
-}
-
-// 新增支付回执
-export function addRecordPaymentReceipt(data) {
-  return request({
-    url: '/business/recordPaymentReceipt',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改支付回执
-export function updateRecordPaymentReceipt(data) {
-  return request({
-    url: '/business/recordPaymentReceipt',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除支付回执
-export function delRecordPaymentReceipt(id) {
-  return request({
-    url: '/business/recordPaymentReceipt/' + id,
-    method: 'delete'
-  })
-}

src/views/business/dealPayment/index.vue

@@ -12,7 +12,7 @@
       <el-form-item label="付款账户" prop="payerAccountName">
         <el-input
           v-model="queryParams.payerAccountName"
-          placeholder="请输入付款账户名"
+          placeholder="请输入付款账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -28,7 +28,7 @@
       <el-form-item label="收款账户" prop="payeeAccountName">
         <el-input
           v-model="queryParams.payeeAccountName"
-          placeholder="请输入收款账户名"
+          placeholder="请输入收款账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -41,6 +41,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="账单编号" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          placeholder="请输入账单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
@@ -56,7 +64,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:dealPayment:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +76,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:dealPayment:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +88,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:dealPayment:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,7 +99,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:dealPayment:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -97,14 +109,16 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="付款人id" align="center" prop="payerId"/>
-      <el-table-column label="付款账户名" align="center" prop="payerAccountName" />
+      <el-table-column label="付款账户" align="center" prop="payerAccountName"/>
       <el-table-column label="收款人id" align="center" prop="payeeId"/>
-      <el-table-column label="收款账户名" align="center" prop="payeeAccountName" />
+      <el-table-column label="收款账户" align="center" prop="payeeAccountName"/>
       <el-table-column label="交易金额" align="center" prop="transactionAmount"/>
       <el-table-column label="手续费" align="center" prop="fee"/>
       <el-table-column label="付款类型" align="center" prop="paymentType"/>
       <el-table-column label="订单状态" align="center" prop="status"/>
       <el-table-column label="支付方式" align="center" prop="paymentMethod"/>
+      <el-table-column label="账单编号" align="center" prop="billCode"/>
+      <el-table-column label="二维码解析" align="center" prop="qrCode"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -113,21 +127,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:dealPayment:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:dealPayment:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -146,14 +163,14 @@
         <el-form-item label="付款人id" prop="payerId">
           <el-input v-model="form.payerId" placeholder="请输入付款人id"/>
         </el-form-item>
-        <el-form-item label="付款账户名" prop="payerAccountName">
+        <el-form-item label="付款账户" prop="payerAccountName">
-          <el-input v-model="form.payerAccountName" placeholder="请输入付款账户名" />
+          <el-input v-model="form.payerAccountName" placeholder="请输入付款账户"/>
         </el-form-item>
         <el-form-item label="收款人id" prop="payeeId">
           <el-input v-model="form.payeeId" placeholder="请输入收款人id"/>
         </el-form-item>
-        <el-form-item label="收款账户名" prop="payeeAccountName">
+        <el-form-item label="收款账户" prop="payeeAccountName">
-          <el-input v-model="form.payeeAccountName" placeholder="请输入收款账户名" />
+          <el-input v-model="form.payeeAccountName" placeholder="请输入收款账户"/>
         </el-form-item>
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input v-model="form.transactionAmount" placeholder="请输入交易金额"/>
@@ -164,6 +181,12 @@
         <el-form-item label="支付方式" prop="paymentMethod">
           <el-input v-model="form.paymentMethod" placeholder="请输入支付方式"/>
         </el-form-item>
+        <el-form-item label="付款类型" prop="paymentType">
+          <el-input v-model="form.paymentType" placeholder="请输入支付方式"/>
+        </el-form-item>
+        <el-form-item label="账单编号" prop="billCode">
+          <el-input v-model="form.billCode" placeholder="请输入账单编号"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
@@ -180,13 +203,13 @@
         <el-form-item label="付款人id：">
           {{ form.payerId }}
         </el-form-item>
-                    <el-form-item label="付款账户名：">
+        <el-form-item label="付款账户：">
           {{ form.payerAccountName }}
         </el-form-item>
         <el-form-item label="收款人id：">
           {{ form.payeeId }}
         </el-form-item>
-                    <el-form-item label="收款账户名：">
+        <el-form-item label="收款账户：">
           {{ form.payeeAccountName }}
         </el-form-item>
         <el-form-item label="交易金额：">
@@ -198,9 +221,14 @@
         <el-form-item label="支付方式：">
           {{ form.paymentMethod }}
         </el-form-item>
+        <el-form-item label="账单编号：">
+          {{ form.billCode }}
+        </el-form-item>
+        <el-form-item label="二维码解析：">
+          {{ form.qrCode }}
+        </el-form-item>
         <el-form-item label="备注：">
           {{ form.remark }}
-
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -211,7 +239,13 @@
 </template>
 
 <script>
-import { listDealPayment, getDealPayment, delDealPayment, addDealPayment, updateDealPayment } from "@/api/business/dealPayment";
+import {
+  listDealPayment,
+  getDealPayment,
+  delDealPayment,
+  addDealPayment,
+  updateDealPayment
+} from "@/api/business/dealPayment";
 
 export default {
   name: "DealPayment",
@@ -252,40 +286,28 @@ export default {
         paymentType: undefined,
         status: undefined,
         paymentMethod: undefined,
-        creator: undefined,
+        billCode: undefined,
-        modifier: undefined,
+        qrCode: undefined
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "订单编号不能为空", trigger: "blur" }
-        ],
         payerId: [
           {required: true, message: "付款人id不能为空", trigger: "blur"}
         ],
         payerAccountName: [
-          { required: true, message: "付款账户名不能为空", trigger: "blur" }
+          {required: true, message: "付款账户不能为空", trigger: "blur"}
         ],
         payeeId: [
           {required: true, message: "收款人id不能为空", trigger: "blur"}
         ],
         payeeAccountName: [
-          { required: true, message: "收款账户名不能为空", trigger: "blur" }
+          {required: true, message: "收款账户不能为空", trigger: "blur"}
         ],
         transactionAmount: [
           {required: true, message: "交易金额不能为空", trigger: "blur"}
         ],
-        paymentType: [
-          { required: true, message: "付款类型不能为空", trigger: "change" }
-        ],
-        status: [
-          { required: true, message: "订单状态不能为空", trigger: "change" }
-        ],
-        paymentMethod: [
-          { required: true, message: "支付方式不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -323,10 +345,12 @@ export default {
         paymentMethod: undefined,
         createTime: undefined,
         updateTime: undefined,
-        creator: undefined,
+        createBy: undefined,
-        modifier: undefined,
+        updateBy: undefined,
         remark: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        billCode: undefined,
+        qrCode: undefined
       };
       this.resetForm("form");
     },

src/views/business/dealProxy/index.vue

@@ -9,10 +9,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="代缴账户" prop="proxyPayerAccountName">
+      <el-form-item label="代缴用户" prop="proxyPayerAccountName">
         <el-input
           v-model="queryParams.proxyPayerAccountName"
-          placeholder="请输入代缴账户名"
+          placeholder="请输入代缴用户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="代缴账户" prop="proxyServiceAccount">
+        <el-input
+          v-model="queryParams.proxyServiceAccount"
+          placeholder="请输入代缴服务账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -40,7 +48,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:dealProxy:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +60,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:dealProxy:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +72,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:dealProxy:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,7 +83,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:dealProxy:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -81,14 +93,15 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="代缴人id" align="center" prop="proxyPayerId"/>
-      <el-table-column label="代缴账户名" align="center" prop="proxyPayerAccountName" />
+      <el-table-column label="代缴用户名" align="center" prop="proxyPayerAccountName"/>
       <el-table-column label="交易金额" align="center" prop="transactionAmount"/>
       <el-table-column label="手续费" align="center" prop="fee"/>
-      <el-table-column label="代缴服务类型" align="center" prop="proxyServiceType" />
+      <el-table-column label="代缴类型" align="center" prop="proxyServiceType"/>
-      <el-table-column label="代缴服务账户" align="center" prop="proxyServiceAccount" />
+      <el-table-column label="代缴账户" align="center" prop="proxyServiceAccount"/>
       <el-table-column label="订单状态" align="center" prop="status"/>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="支付渠道" align="center" prop="paymentChannel"/>
+      <el-table-column label="账单编号" align="center" prop="billCode"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -96,21 +109,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:dealProxy:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:dealProxy:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -129,8 +145,8 @@
         <el-form-item label="代缴人id" prop="proxyPayerId">
           <el-input v-model="form.proxyPayerId" placeholder="请输入代缴人id"/>
         </el-form-item>
-        <el-form-item label="代缴账户名" prop="proxyPayerAccountName">
+        <el-form-item label="代缴用户名" prop="proxyPayerAccountName">
-          <el-input v-model="form.proxyPayerAccountName" placeholder="请输入代缴账户名" />
+          <el-input v-model="form.proxyPayerAccountName" placeholder="请输入代缴用户名"/>
         </el-form-item>
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input v-model="form.transactionAmount" placeholder="请输入交易金额"/>
@@ -147,7 +163,6 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -161,7 +176,7 @@
         <el-form-item label="代缴人id：">
           {{ form.proxyPayerId }}
         </el-form-item>
-                    <el-form-item label="代缴账户名：">
+        <el-form-item label="代缴用户名：">
           {{ form.proxyPayerAccountName }}
         </el-form-item>
         <el-form-item label="交易金额：">
@@ -173,13 +188,15 @@
         <el-form-item label="代缴服务账户：">
           {{ form.proxyServiceAccount }}
         </el-form-item>
-                    <el-form-item label="备注：">
-                      {{form.remark}}
-
-                    </el-form-item>
         <el-form-item label="支付渠道：">
           {{ form.paymentChannel }}
         </el-form-item>
+        <el-form-item label="账单编号：">
+          {{ form.billCode }}
+        </el-form-item>
+        <el-form-item label="备注：">
+          {{ form.remark }}
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">关 闭</el-button>
@@ -228,32 +245,22 @@ export default {
         proxyServiceType: undefined,
         proxyServiceAccount: undefined,
         status: undefined,
-        creator: undefined,
-        modifier: undefined,
         paymentChannel: undefined,
+        billCode: undefined
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "订单编号不能为空", trigger: "blur" }
-        ],
         proxyPayerId: [
           {required: true, message: "代缴人id不能为空", trigger: "blur"}
         ],
         proxyPayerAccountName: [
-          { required: true, message: "代缴账户名不能为空", trigger: "blur" }
+          {required: true, message: "代缴用户名不能为空", trigger: "blur"}
         ],
         transactionAmount: [
           {required: true, message: "交易金额不能为空", trigger: "blur"}
         ],
-        proxyServiceAccount: [
-          { required: true, message: "代缴服务账户不能为空", trigger: "blur" }
-        ],
-        paymentChannel: [
-          { required: true, message: "支付渠道不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -287,13 +294,14 @@ export default {
         proxyServiceType: undefined,
         proxyServiceAccount: undefined,
         status: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined,
-        creator: undefined,
-        modifier: undefined,
         remark: undefined,
         paymentChannel: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        billCode: undefined
       };
       this.resetForm("form");
     },

src/views/business/dealReceipt/index.vue

@@ -28,15 +28,23 @@
       <el-form-item label="收款账户" prop="payeeAccountName">
         <el-input
           v-model="queryParams.payeeAccountName"
-          placeholder="请输入收款账户名"
+          placeholder="请输入收款账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="支付方式" prop="paymentMethod">
+      <el-form-item label="付款方式" prop="paymentMethod">
         <el-input
           v-model="queryParams.paymentMethod"
-          placeholder="请输入支付方式"
+          placeholder="请输入付款方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="账单编号" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          placeholder="请输入账单编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -56,7 +64,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:dealReceipt:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +76,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:dealReceipt:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +88,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:dealReceipt:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,7 +99,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:dealReceipt:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -97,15 +109,17 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="付款人id" align="center" prop="payerId"/>
-      <el-table-column label="付款账户名" align="center" prop="payerAccountName" />
+      <el-table-column label="付款账户" align="center" prop="payerAccountName"/>
       <el-table-column label="收款人id" align="center" prop="payeeId"/>
-      <el-table-column label="收款账户名" align="center" prop="payeeAccountName" />
+      <el-table-column label="收款账户" align="center" prop="payeeAccountName"/>
       <el-table-column label="交易金额" align="center" prop="transactionAmount"/>
       <el-table-column label="手续费" align="center" prop="fee"/>
       <el-table-column label="收款类型" align="center" prop="receiptType"/>
       <el-table-column label="订单状态" align="center" prop="status"/>
-      <el-table-column label="支付方式" align="center" prop="paymentMethod" />
+      <el-table-column label="付款方式" align="center" prop="paymentMethod"/>
       <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="账单编号" align="center" prop="billCode"/>
+      <el-table-column label="二维码解析" align="center" prop="qrCode"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -113,21 +127,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:dealReceipt:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:dealReceipt:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -152,8 +169,8 @@
         <el-form-item label="收款人id" prop="payeeId">
           <el-input v-model="form.payeeId" placeholder="请输入收款人id"/>
         </el-form-item>
-        <el-form-item label="收款账户名" prop="payeeAccountName">
+        <el-form-item label="收款账户" prop="payeeAccountName">
-          <el-input v-model="form.payeeAccountName" placeholder="请输入收款账户名" />
+          <el-input v-model="form.payeeAccountName" placeholder="请输入收款账户"/>
         </el-form-item>
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input v-model="form.transactionAmount" placeholder="请输入交易金额"/>
@@ -161,12 +178,15 @@
         <el-form-item label="手续费" prop="fee">
           <el-input v-model="form.fee" placeholder="请输入手续费"/>
         </el-form-item>
-        <el-form-item label="支付方式" prop="paymentMethod">
+        <el-form-item label="" prop="paymentMethod">
-          <el-input v-model="form.paymentMethod" placeholder="请输入支付方式" />
+          <el-input v-model="form.paymentMethod" placeholder="请输入"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
+        <el-form-item label="账单编号" prop="billCode">
+          <el-input v-model="form.billCode" placeholder="请输入账单编号"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -186,7 +206,7 @@
         <el-form-item label="收款人id：">
           {{ form.payeeId }}
         </el-form-item>
-                    <el-form-item label="收款账户名：">
+        <el-form-item label="收款账户：">
           {{ form.payeeAccountName }}
         </el-form-item>
         <el-form-item label="交易金额：">
@@ -195,18 +215,17 @@
         <el-form-item label="手续费：">
           {{ form.fee }}
         </el-form-item>
-                    <el-form-item label="支付方式：">
+        <el-form-item label="：">
           {{ form.paymentMethod }}
         </el-form-item>
-                    <el-form-item label="创建人：">
-                      {{form.creator}}
-                    </el-form-item>
-                    <el-form-item label="修改人：">
-                      {{form.modifier}}
-                    </el-form-item>
         <el-form-item label="备注：">
           {{ form.remark }}
-
+        </el-form-item>
+        <el-form-item label="账单编号：">
+          {{ form.billCode }}
+        </el-form-item>
+        <el-form-item label="二维码解析：">
+          {{ form.qrCode }}
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,7 +236,13 @@
 </template>
 
 <script>
-import { listDealReceipt, getDealReceipt, delDealReceipt, addDealReceipt, updateDealReceipt } from "@/api/business/dealReceipt";
+import {
+  listDealReceipt,
+  getDealReceipt,
+  delDealReceipt,
+  addDealReceipt,
+  updateDealReceipt
+} from "@/api/business/dealReceipt";
 
 export default {
   name: "DealReceipt",
@@ -258,16 +283,13 @@ export default {
         receiptType: undefined,
         status: undefined,
         paymentMethod: undefined,
-        creator: undefined,
+        billCode: undefined,
-        modifier: undefined,
+        qrCode: undefined
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "订单编号不能为空", trigger: "blur" }
-        ],
         payerId: [
           {required: true, message: "付款人id不能为空", trigger: "blur"}
         ],
@@ -278,17 +300,11 @@ export default {
           {required: true, message: "收款人id不能为空", trigger: "blur"}
         ],
         payeeAccountName: [
-          { required: true, message: "收款账户名不能为空", trigger: "blur" }
+          {required: true, message: "收款账户不能为空", trigger: "blur"}
         ],
         transactionAmount: [
           {required: true, message: "交易金额不能为空", trigger: "blur"}
         ],
-        receiptType: [
-          { required: true, message: "收款类型不能为空", trigger: "change" }
-        ],
-        paymentMethod: [
-          { required: true, message: "支付方式不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -324,12 +340,14 @@ export default {
         receiptType: undefined,
         status: undefined,
         paymentMethod: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined,
-        creator: undefined,
-        modifier: undefined,
         remark: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        billCode: undefined,
+        qrCode: undefined
       };
       this.resetForm("form");
     },

src/views/business/dealRecharge/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="充值用户" prop="rechargeUserId">
+      <el-form-item label="充值id" prop="rechargeUserId">
         <el-input
           v-model="queryParams.rechargeUserId"
           placeholder="请输入充值用户id"
@@ -12,13 +12,11 @@
       <el-form-item label="充值账户" prop="rechargeAccountName">
         <el-input
           v-model="queryParams.rechargeAccountName"
-          placeholder="请输入充值账户名"
+          placeholder="请输入充值账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-
       <el-form-item label="支付方式" prop="paymentMethod">
         <el-input
           v-model="queryParams.paymentMethod"
@@ -35,7 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="账单编号" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          placeholder="请输入账单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
@@ -96,13 +101,14 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="充值用户id" align="center" prop="rechargeUserId"/>
-      <el-table-column label="充值账户名" align="center" prop="rechargeAccountName"/>
+      <el-table-column label="充值账户" align="center" prop="rechargeAccountName"/>
       <el-table-column label="交易金额" align="center" prop="transactionAmount"/>
       <el-table-column label="手续费" align="center" prop="fee"/>
-      <el-table-column label="实际到账金额" align="center" prop="actualAmount"/>
+      <el-table-column label="实际到账" align="center" prop="actualAmount"/>
       <el-table-column label="支付方式" align="center" prop="paymentMethod"/>
       <el-table-column label="充值方式" align="center" prop="rechargeMethod"/>
       <el-table-column label="订单状态" align="center" prop="status"/>
+      <el-table-column label="账单编号" align="center" prop="billCode"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -147,8 +153,8 @@
         <el-form-item label="充值用户id" prop="rechargeUserId">
           <el-input v-model="form.rechargeUserId" placeholder="请输入充值用户id"/>
         </el-form-item>
-        <el-form-item label="充值账户名" prop="rechargeAccountName">
+        <el-form-item label="充值账户" prop="rechargeAccountName">
-          <el-input v-model="form.rechargeAccountName" placeholder="请输入充值账户名"/>
+          <el-input v-model="form.rechargeAccountName" placeholder="请输入充值账户"/>
         </el-form-item>
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input v-model="form.transactionAmount" placeholder="请输入交易金额"/>
@@ -165,6 +171,9 @@
         <el-form-item label="充值方式" prop="rechargeMethod">
           <el-input v-model="form.rechargeMethod" placeholder="请输入充值方式"/>
         </el-form-item>
+        <el-form-item label="账单编号" prop="billCode">
+          <el-input v-model="form.billCode" placeholder="请输入账单编号"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
@@ -181,7 +190,7 @@
         <el-form-item label="充值用户id：">
           {{ form.rechargeUserId }}
         </el-form-item>
-        <el-form-item label="充值账户名：">
+        <el-form-item label="充值账户：">
           {{ form.rechargeAccountName }}
         </el-form-item>
         <el-form-item label="交易金额：">
@@ -199,15 +208,11 @@
         <el-form-item label="充值方式：">
           {{ form.rechargeMethod }}
         </el-form-item>
-        <el-form-item label="创建人：">
+        <el-form-item label="账单编号：">
-          {{ form.creator }}
+          {{ form.billCode }}
-        </el-form-item>
-        <el-form-item label="修改人：">
-          {{ form.modifier }}
         </el-form-item>
         <el-form-item label="备注：">
           {{ form.remark }}
-
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -264,21 +269,17 @@ export default {
         paymentMethod: undefined,
         rechargeMethod: undefined,
         status: undefined,
-        creator: undefined,
+        billCode: undefined
-        modifier: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          {required: true, message: "订单编号不能为空", trigger: "blur"}
-        ],
         rechargeUserId: [
           {required: true, message: "充值用户id不能为空", trigger: "blur"}
         ],
         rechargeAccountName: [
-          {required: true, message: "充值账户名不能为空", trigger: "blur"}
+          {required: true, message: "充值账户不能为空", trigger: "blur"}
         ],
         transactionAmount: [
           {required: true, message: "交易金额不能为空", trigger: "blur"}
@@ -323,12 +324,13 @@ export default {
         paymentMethod: undefined,
         rechargeMethod: undefined,
         status: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined,
-        creator: undefined,
-        modifier: undefined,
         remark: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        billCode: undefined
       };
       this.resetForm("form");
     },

src/views/business/dealTransfer/index.vue

@@ -12,7 +12,7 @@
       <el-form-item label="转出账户" prop="senderAccountName">
         <el-input
           v-model="queryParams.senderAccountName"
-          placeholder="请输入转出账户名"
+          placeholder="请输入转出账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -28,7 +28,7 @@
       <el-form-item label="接收账户" prop="receiverAccountName">
         <el-input
           v-model="queryParams.receiverAccountName"
-          placeholder="请输入接收人账户名"
+          placeholder="请输入接收账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -41,6 +41,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="账单编号" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          placeholder="请输入账单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
@@ -101,14 +109,15 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="转出人id" align="center" prop="senderId"/>
-      <el-table-column label="转出账户名" align="center" prop="senderAccountName"/>
+      <el-table-column label="转出账户" align="center" prop="senderAccountName"/>
       <el-table-column label="接收人id" align="center" prop="receiverId"/>
-      <el-table-column label="接收人账户名" align="center" prop="receiverAccountName"/>
+      <el-table-column label="接收账户" align="center" prop="receiverAccountName"/>
       <el-table-column label="交易金额" align="center" prop="transactionAmount"/>
       <el-table-column label="手续费" align="center" prop="fee"/>
       <el-table-column label="转账类型" align="center" prop="transferType"/>
       <el-table-column label="订单状态" align="center" prop="status"/>
       <el-table-column label="支付方式" align="center" prop="paymentMethod"/>
+      <el-table-column label="账单编号" align="center" prop="billCode"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -153,14 +162,14 @@
         <el-form-item label="转出人id" prop="senderId">
           <el-input v-model="form.senderId" placeholder="请输入转出人id"/>
         </el-form-item>
-        <el-form-item label="转出账户名" prop="senderAccountName">
+        <el-form-item label="转出账户" prop="senderAccountName">
-          <el-input v-model="form.senderAccountName" placeholder="请输入转出账户名"/>
+          <el-input v-model="form.senderAccountName" placeholder="请输入转出账户"/>
         </el-form-item>
         <el-form-item label="接收人id" prop="receiverId">
           <el-input v-model="form.receiverId" placeholder="请输入接收人id"/>
         </el-form-item>
-        <el-form-item label="接收人账户名" prop="receiverAccountName">
+        <el-form-item label="接收账户" prop="receiverAccountName">
-          <el-input v-model="form.receiverAccountName" placeholder="请输入接收人账户名"/>
+          <el-input v-model="form.receiverAccountName" placeholder="请输入接收账户"/>
         </el-form-item>
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input v-model="form.transactionAmount" placeholder="请输入交易金额"/>
@@ -171,6 +180,9 @@
         <el-form-item label="支付方式" prop="paymentMethod">
           <el-input v-model="form.paymentMethod" placeholder="请输入支付方式"/>
         </el-form-item>
+        <el-form-item label="账单编号" prop="billCode">
+          <el-input v-model="form.billCode" placeholder="请输入账单编号"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
@@ -187,13 +199,13 @@
         <el-form-item label="转出人id：">
           {{ form.senderId }}
         </el-form-item>
-        <el-form-item label="转出账户名：">
+        <el-form-item label="转出账户：">
           {{ form.senderAccountName }}
         </el-form-item>
         <el-form-item label="接收人id：">
           {{ form.receiverId }}
         </el-form-item>
-        <el-form-item label="接收人账户名：">
+        <el-form-item label="接收账户：">
           {{ form.receiverAccountName }}
         </el-form-item>
         <el-form-item label="交易金额：">
@@ -205,6 +217,9 @@
         <el-form-item label="支付方式：">
           {{ form.paymentMethod }}
         </el-form-item>
+        <el-form-item label="账单编号：">
+          {{ form.billCode }}
+        </el-form-item>
         <el-form-item label="备注：">
           {{ form.remark }}
         </el-form-item>
@@ -264,8 +279,7 @@ export default {
         transferType: undefined,
         status: undefined,
         paymentMethod: undefined,
-        creator: undefined,
+        billCode: undefined
-        modifier: undefined,
       },
       // 表单参数
       form: {},
@@ -275,20 +289,17 @@ export default {
           {required: true, message: "转出人id不能为空", trigger: "blur"}
         ],
         senderAccountName: [
-          {required: true, message: "转出账户名不能为空", trigger: "blur"}
+          {required: true, message: "转出账户不能为空", trigger: "blur"}
         ],
         receiverId: [
           {required: true, message: "接收人id不能为空", trigger: "blur"}
         ],
         receiverAccountName: [
-          {required: true, message: "接收人账户名不能为空", trigger: "blur"}
+          {required: true, message: "接收账户不能为空", trigger: "blur"}
         ],
         transactionAmount: [
           {required: true, message: "交易金额不能为空", trigger: "blur"}
-        ],
+        ]
-        paymentMethod: [
-          {required: true, message: "支付方式不能为空", trigger: "blur"}
-        ],
       }
     };
   },
@@ -324,12 +335,13 @@ export default {
         transferType: undefined,
         status: undefined,
         paymentMethod: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined,
-        creator: undefined,
-        modifier: undefined,
         remark: undefined,
-        delFlag: undefined
+        delFlag: undefined,
+        billCode: undefined
       };
       this.resetForm("form");
     },

src/views/business/dealWithdrawal/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="提现用户" prop="withdrawalUserId">
+      <el-form-item label="提现id" prop="withdrawalUserId">
         <el-input
           v-model="queryParams.withdrawalUserId"
-          placeholder="请输入提现账户id"
+          placeholder="请输入提现用户id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -12,15 +12,15 @@
       <el-form-item label="提现账户" prop="withdrawalAccountName">
         <el-input
           v-model="queryParams.withdrawalAccountName"
-          placeholder="请输入提现账户名"
+          placeholder="请输入提现账户"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="提现方式" prop="withdrawalMethod">
+      <el-form-item label="账单编号" prop="billCode">
         <el-input
-          v-model="queryParams.withdrawalMethod"
+          v-model="queryParams.billCode"
-          placeholder="请输入提现方式"
+          placeholder="请输入账单编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -40,7 +40,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:dealWithdrawal:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +52,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:dealWithdrawal:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:dealWithdrawal:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,7 +75,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:dealWithdrawal:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -81,12 +85,13 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="提现用户id" align="center" prop="withdrawalUserId"/>
-      <el-table-column label="提现账户名" align="center" prop="withdrawalAccountName" />
+      <el-table-column label="提现账户" align="center" prop="withdrawalAccountName"/>
       <el-table-column label="交易金额" align="center" prop="transactionAmount"/>
       <el-table-column label="手续费" align="center" prop="fee"/>
-      <el-table-column label="实际到账金额" align="center" prop="actualAmount" />
+      <el-table-column label="实际到账" align="center" prop="actualAmount"/>
       <el-table-column label="提现方式" align="center" prop="withdrawalMethod"/>
       <el-table-column label="订单状态" align="center" prop="status"/>
+      <el-table-column label="账单编号" align="center" prop="billCode"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -95,21 +100,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:dealWithdrawal:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:dealWithdrawal:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -128,8 +136,8 @@
         <el-form-item label="提现用户id" prop="withdrawalUserId">
           <el-input v-model="form.withdrawalUserId" placeholder="请输入提现用户id"/>
         </el-form-item>
-        <el-form-item label="提现账户名" prop="withdrawalAccountName">
+        <el-form-item label="提现账户" prop="withdrawalAccountName">
-          <el-input v-model="form.withdrawalAccountName" placeholder="请输入提现账户名" />
+          <el-input v-model="form.withdrawalAccountName" placeholder="请输入提现账户"/>
         </el-form-item>
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input v-model="form.transactionAmount" placeholder="请输入交易金额"/>
@@ -143,6 +151,9 @@
         <el-form-item label="提现方式" prop="withdrawalMethod">
           <el-input v-model="form.withdrawalMethod" placeholder="请输入提现方式"/>
         </el-form-item>
+        <el-form-item label="账单编号" prop="billCode">
+          <el-input v-model="form.billCode" placeholder="请输入账单编号"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
@@ -159,7 +170,7 @@
         <el-form-item label="提现用户id：">
           {{ form.withdrawalUserId }}
         </el-form-item>
-                    <el-form-item label="提现账户名：">
+        <el-form-item label="提现账户：">
           {{ form.withdrawalAccountName }}
         </el-form-item>
         <el-form-item label="交易金额：">
@@ -174,15 +185,11 @@
         <el-form-item label="提现方式：">
           {{ form.withdrawalMethod }}
         </el-form-item>
-                    <el-form-item label="创建人：">
+        <el-form-item label="账单编号：">
-                      {{form.creator}}
+          {{ form.billCode }}
-                    </el-form-item>
-                    <el-form-item label="修改人：">
-                      {{form.modifier}}
         </el-form-item>
         <el-form-item label="备注：">
           {{ form.remark }}
-
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -193,7 +200,13 @@
 </template>
 
 <script>
-import { listDealWithdrawal, getDealWithdrawal, delDealWithdrawal, addDealWithdrawal, updateDealWithdrawal } from "@/api/business/dealWithdrawal";
+import {
+  listDealWithdrawal,
+  getDealWithdrawal,
+  delDealWithdrawal,
+  addDealWithdrawal,
+  updateDealWithdrawal
+} from "@/api/business/dealWithdrawal";
 
 export default {
   name: "DealWithdrawal",
@@ -232,28 +245,20 @@ export default {
         actualAmount: undefined,
         withdrawalMethod: undefined,
         status: undefined,
-        creator: undefined,
-        modifier: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "订单编号不能为空", trigger: "blur" }
-        ],
         withdrawalUserId: [
           {required: true, message: "提现用户id不能为空", trigger: "blur"}
         ],
         withdrawalAccountName: [
-          { required: true, message: "提现账户名不能为空", trigger: "blur" }
+          {required: true, message: "提现账户不能为空", trigger: "blur"}
         ],
         transactionAmount: [
           {required: true, message: "交易金额不能为空", trigger: "blur"}
         ],
-        withdrawalMethod: [
-          { required: true, message: "提现方式不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -287,10 +292,10 @@ export default {
         actualAmount: undefined,
         withdrawalMethod: undefined,
         status: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined,
-        creator: undefined,
-        modifier: undefined,
         remark: undefined,
         delFlag: undefined
       };

src/views/business/feeRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单编号" prop="relatedOrderId">
+      <el-form-item label="关联订单编号" prop="relatedOrderId">
         <el-input
           v-model="queryParams.relatedOrderId"
           placeholder="请输入关联订单编号"
@@ -17,15 +17,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="规则号" prop="feeStandardId">
+      <el-form-item label="手续费标准编号" prop="feeStandardId">
         <el-input
           v-model="queryParams.feeStandardId"
-          placeholder="请输入手续费规则标准编号"
+          placeholder="请输入手续费标准编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠规则编号" prop="discountRuleId">
+        <el-input
+          v-model="queryParams.discountRuleId"
+          placeholder="请输入优惠规则编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="交易时间" prop="feeCollectionTime">
+      <el-form-item label="手续费收取时间" prop="feeCollectionTime">
         <el-date-picker clearable
                         v-model="queryParams.feeCollectionTime"
                         type="date"
@@ -48,7 +56,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:feeRecord:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -59,7 +68,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:feeRecord:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -70,7 +80,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:feeRecord:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -80,7 +91,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:feeRecord:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -109,21 +121,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:feeRecord:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:feeRecord:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -263,9 +278,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "记录编号不能为空", trigger: "blur" }
-        ],
         relatedOrderId: [
           {required: true, message: "关联订单编号不能为空", trigger: "blur"}
         ],
@@ -277,16 +289,7 @@ export default {
         ],
         discountRuleId: [
           {required: true, message: "优惠规则编号不能为空", trigger: "blur"}
-        ],
+        ]
-        calculatedFeeAmount: [
-          { required: true, message: "计算手续费金额不能为空", trigger: "blur" }
-        ],
-        discountedFeeAmount: [
-          { required: true, message: "优惠减免手续费金额不能为空", trigger: "blur" }
-        ],
-        actualFeeAmount: [
-          { required: true, message: "实际收取手续费金额不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -323,7 +326,9 @@ export default {
         actualFeeAmount: undefined,
         feeCollectionTime: undefined,
         status: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined,
         delFlag: undefined
       };

src/views/business/feeStandard/index.vue

@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="适用条件" prop="applicableCondition">
-        <el-input
-          v-model="queryParams.applicableCondition"
-          placeholder="请输入适用条件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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>
@@ -32,7 +24,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['business:feeStandard:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -43,7 +36,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['business:feeStandard:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -54,7 +48,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['business:feeStandard:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -64,14 +59,15 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['business:feeStandard:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="feeStandardList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="手续费标准编号" align="center" prop="feeStandardId" v-if="true"/>
+      <el-table-column label="手续费标准编号" align="center" prop="id" v-if="true"/>
       <el-table-column label="业务类型" align="center" prop="businessType"/>
       <el-table-column label="用户级别" align="center" prop="userLevel"/>
       <el-table-column label="手续费类型" align="center" prop="feeType"/>
@@ -86,21 +82,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:feeStandard:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:feeStandard:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -166,7 +165,13 @@
 </template>
 
 <script>
-import { listFeeStandard, getFeeStandard, delFeeStandard, addFeeStandard, updateFeeStandard } from "@/api/business/feeStandard";
+import {
+  listFeeStandard,
+  getFeeStandard,
+  delFeeStandard,
+  addFeeStandard,
+  updateFeeStandard
+} from "@/api/business/feeStandard";
 
 export default {
   name: "FeeStandard",
@@ -209,17 +214,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
+      rules: {}
-        feeStandardId: [
-          { required: true, message: "手续费标准编号不能为空", trigger: "blur" }
-        ],
-        userLevel: [
-          { required: true, message: "用户级别不能为空", trigger: "blur" }
-        ],
-        feeType: [
-          { required: true, message: "手续费类型不能为空", trigger: "change" }
-        ],
-      }
     };
   },
   created() {
@@ -244,7 +239,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        feeStandardId: undefined,
+        id: undefined,
         businessType: undefined,
         userLevel: undefined,
         feeType: undefined,
@@ -252,7 +247,9 @@ export default {
         minFee: undefined,
         maxFee: undefined,
         applicableCondition: undefined,
+        createBy: undefined,
         createTime: undefined,
+        updateBy: undefined,
         updateTime: undefined
       };
       this.resetForm("form");
@@ -269,7 +266,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.feeStandardId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -290,8 +287,8 @@ export default {
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-      const feeStandardId = row.feeStandardId || this.ids
+      const id = row.id || this.ids
-      getFeeStandard(feeStandardId).then(response => {
+      getFeeStandard(id).then(response => {
         this.loading = false;
         this.form = response.data;
         this.open = true;
@@ -303,7 +300,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          if (this.form.feeStandardId != null) {
+          if (this.form.id != null) {
             updateFeeStandard(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -325,10 +322,10 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const feeStandardIds = row.feeStandardId || this.ids;
+      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除手续费规则编号为"' + feeStandardIds + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除手续费规则编号为"' + ids + '"的数据项？').then(() => {
         this.loading = true;
-        return delFeeStandard(feeStandardIds);
+        return delFeeStandard(ids);
       }).then(() => {
         this.loading = false;
         this.getList();

src/views/business/recordPaymentReceipt/index.vue → src/views/business/recordPayCallback/index.vue

@@ -25,14 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="交易金额" prop="transactionAmount">
-        <el-input
-          v-model="queryParams.transactionAmount"
-          placeholder="请输入交易金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="支付渠道交易编号" prop="paymentChannelNo">
         <el-input
           v-model="queryParams.paymentChannelNo"
@@ -49,38 +41,6 @@
                         placeholder="请选择回执时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="验证失败原因" prop="verificationFailureReason">
-        <el-input
-          v-model="queryParams.verificationFailureReason"
-          placeholder="请输入验证失败原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="IP地址" prop="ipAddress">
-        <el-input
-          v-model="queryParams.ipAddress"
-          placeholder="请输入IP地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改人" prop="modifier">
-        <el-input
-          v-model="queryParams.modifier"
-          placeholder="请输入修改人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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>
@@ -95,8 +55,9 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['business:recordPaymentReceipt:add']"
+          v-hasPermi="['business:recordPayCallback:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -106,8 +67,9 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['business:recordPaymentReceipt:edit']"
+          v-hasPermi="['business:recordPayCallback:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -117,8 +79,9 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['business:recordPaymentReceipt:remove']"
+          v-hasPermi="['business:recordPayCallback:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -127,15 +90,18 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['business:recordPaymentReceipt:export']"
+          v-hasPermi="['business:recordPayCallback:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordPaymentReceiptList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="recordPayCallbackList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="回执编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="处理状态" align="center" prop="processingStatus"/>
+      <el-table-column label="IP地址" align="center" prop="ipAddress"/>
       <el-table-column label="用户编号" align="center" prop="userId"/>
       <el-table-column label="关联订单编号" align="center" prop="relatedOrderId"/>
       <el-table-column label="第三方支付平台名称" align="center" prop="thirdPartyPlatform"/>
@@ -150,10 +116,6 @@
       <el-table-column label="回执内容" align="center" prop="receiptContent"/>
       <el-table-column label="验证状态" align="center" prop="verificationStatus"/>
       <el-table-column label="验证失败原因" align="center" prop="verificationFailureReason"/>
-      <el-table-column label="处理状态" align="center" prop="processingStatus" />
-      <el-table-column label="IP地址" align="center" prop="ipAddress" />
-      <el-table-column label="创建人" align="center" prop="creator" />
-      <el-table-column label="修改人" align="center" prop="modifier" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -161,21 +123,24 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
-            >详情</el-button>
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:recordPaymentReceipt:edit']"
+            v-hasPermi="['business:recordPayCallback:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['business:recordPaymentReceipt:remove']"
+            v-hasPermi="['business:recordPayCallback:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -191,6 +156,9 @@
     <!-- 添加或修改支付回执对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="IP地址" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="请输入IP地址"/>
+        </el-form-item>
         <el-form-item label="用户编号" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入用户编号"/>
         </el-form-item>
@@ -220,15 +188,6 @@
         <el-form-item label="验证失败原因" prop="verificationFailureReason">
           <el-input v-model="form.verificationFailureReason" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
-        <el-form-item label="IP地址" prop="ipAddress">
-          <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="creator">
-          <el-input v-model="form.creator" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="修改人" prop="modifier">
-          <el-input v-model="form.modifier" placeholder="请输入修改人" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -239,6 +198,9 @@
     <!-- 支付回执详情 -->
     <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="auto">
+        <el-form-item label="IP地址：">
+          {{ form.ipAddress }}
+        </el-form-item>
         <el-form-item label="用户编号：">
           {{ form.userId }}
         </el-form-item>
@@ -267,16 +229,6 @@
         </el-form-item>
         <el-form-item label="验证失败原因：">
           {{ form.verificationFailureReason }}
-
-                    </el-form-item>
-                    <el-form-item label="IP地址：">
-                      {{form.ipAddress}}
-                    </el-form-item>
-                    <el-form-item label="创建人：">
-                      {{form.creator}}
-                    </el-form-item>
-                    <el-form-item label="修改人：">
-                      {{form.modifier}}
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -287,10 +239,16 @@
 </template>
 
 <script>
-import { listRecordPaymentReceipt, getRecordPaymentReceipt, delRecordPaymentReceipt, addRecordPaymentReceipt, updateRecordPaymentReceipt } from "@/api/business/recordPaymentReceipt";
+import {
+  listRecordPayCallback,
+  getRecordPayCallback,
+  delRecordPayCallback,
+  addRecordPayCallback,
+  updateRecordPayCallback
+} from "@/api/business/recordPayCallback";
 
 export default {
-  name: "RecordPaymentReceipt",
+  name: "RecordPayCallback",
   data() {
     return {
       // 按钮loading
@@ -308,7 +266,7 @@ export default {
       // 总条数
       total: 0,
       // 支付回执表格数据
-      recordPaymentReceiptList: [],
+      recordPayCallbackList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -319,6 +277,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        processingStatus: undefined,
+        ipAddress: undefined,
         userId: undefined,
         relatedOrderId: undefined,
         thirdPartyPlatform: undefined,
@@ -328,65 +288,12 @@ export default {
         receiptTime: undefined,
         receiptContent: undefined,
         verificationStatus: undefined,
-        verificationFailureReason: undefined,
+        verificationFailureReason: undefined
-        processingStatus: undefined,
-        ipAddress: undefined,
-        creator: undefined,
-        modifier: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
+      rules: {}
-        id: [
-          { required: true, message: "回执编号不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户编号不能为空", trigger: "blur" }
-        ],
-        relatedOrderId: [
-          { required: true, message: "关联订单编号不能为空", trigger: "blur" }
-        ],
-        thirdPartyPlatform: [
-          { required: true, message: "第三方支付平台名称不能为空", trigger: "blur" }
-        ],
-        transactionAmount: [
-          { required: true, message: "交易金额不能为空", trigger: "blur" }
-        ],
-        transactionStatus: [
-          { required: true, message: "交易状态不能为空", trigger: "change" }
-        ],
-        paymentChannelNo: [
-          { required: true, message: "支付渠道交易编号不能为空", trigger: "blur" }
-        ],
-        receiptTime: [
-          { required: true, message: "回执时间不能为空", trigger: "blur" }
-        ],
-        receiptContent: [
-          { required: true, message: "回执内容不能为空", trigger: "blur" }
-        ],
-        verificationStatus: [
-          { required: true, message: "验证状态不能为空", trigger: "change" }
-        ],
-        verificationFailureReason: [
-          { required: true, message: "验证失败原因不能为空", trigger: "blur" }
-        ],
-        processingStatus: [
-          { required: true, message: "处理状态不能为空", trigger: "change" }
-        ],
-        ipAddress: [
-          { required: true, message: "IP地址不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        creator: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
-        ],
-        modifier: [
-          { required: true, message: "修改人不能为空", trigger: "blur" }
-        ],
-      }
     };
   },
   created() {
@@ -396,8 +303,8 @@ export default {
     /** 查询支付回执列表 */
     getList() {
       this.loading = true;
-      listRecordPaymentReceipt(this.queryParams).then(response => {
+      listRecordPayCallback(this.queryParams).then(response => {
-        this.recordPaymentReceiptList = response.rows;
+        this.recordPayCallbackList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -412,6 +319,13 @@ export default {
     reset() {
       this.form = {
         id: undefined,
+        processingStatus: undefined,
+        ipAddress: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
         userId: undefined,
         relatedOrderId: undefined,
         thirdPartyPlatform: undefined,
@@ -421,14 +335,7 @@ export default {
         receiptTime: undefined,
         receiptContent: undefined,
         verificationStatus: undefined,
-        verificationFailureReason: undefined,
+        verificationFailureReason: undefined
-        processingStatus: undefined,
-        ipAddress: undefined,
-        createTime: undefined,
-        updateTime: undefined,
-        creator: undefined,
-        modifier: undefined,
-        delFlag: undefined
       };
       this.resetForm("form");
     },
@@ -466,7 +373,7 @@ export default {
       this.loading = true;
       this.reset();
       const id = row.id || this.ids
-      getRecordPaymentReceipt(id).then(response => {
+      getRecordPayCallback(id).then(response => {
         this.loading = false;
         this.form = response.data;
         this.open = true;
@@ -479,7 +386,7 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.id != null) {
-            updateRecordPaymentReceipt(this.form).then(response => {
+            updateRecordPayCallback(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -487,7 +394,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addRecordPaymentReceipt(this.form).then(response => {
+            addRecordPayCallback(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -503,7 +410,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除支付回执编号为"' + ids + '"的数据项？').then(() => {
         this.loading = true;
-        return delRecordPaymentReceipt(ids);
+        return delRecordPayCallback(ids);
       }).then(() => {
         this.loading = false;
         this.getList();
@@ -515,9 +422,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/recordPaymentReceipt/export', {
+      this.download('business/recordPayCallback/export', {
         ...this.queryParams
-      }, `recordPaymentReceipt_${new Date().getTime()}.xlsx`)
+      }, `recordPayCallback_${new Date().getTime()}.xlsx`)
     }
   }
 };

src/views/business/recordTransaction/index.vue

@@ -1,57 +1,97 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.recordTransaction.senderAccount')" prop="senderAccount">
+      <el-form-item label="用户ID" prop="senderId">
-        <el-input v-model="queryParams.senderAccount"
+        <el-input
-                  :placeholder="$t('business.recordTransaction.senderAccountPlaceholder')" clearable
+          v-model="queryParams.senderId"
-                  @keyup.enter.native="handleQuery"/>
+          placeholder="请输入用户ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item :label="$t('business.recordTransaction.receiverAccount')" prop="receiverAccount"
+      <el-form-item label="账户编号" prop="senderAccount">
-                    label-width="130px">
+        <el-input
-        <el-input v-model="queryParams.receiverAccount"
+          v-model="queryParams.senderAccount"
-                  :placeholder="$t('business.recordTransaction.receiverAccountPlaceholder')" clearable
+          placeholder="请输入账户编号"
-                  @keyup.enter.native="handleQuery"/>
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item :label="$t('business.recordTransaction.transactionTime')">
+      <el-form-item label="账单编码" prop="billCode">
-        <el-date-picker v-model="daterangeTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+        <el-input
-                        range-separator="-" :start-placeholder="$t('common.startDate')"
+          v-model="queryParams.billCode"
-                        :end-placeholder="$t('common.endDate')"
+          placeholder="请输入账单编码"
-                        :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item :label="$t('common.createTime')">
+      <el-form-item label="目标用户ID" prop="receiverId">
-        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+        <el-input
-                        type="daterange" range-separator="-" :start-placeholder="$t('common.startDate')"
+          v-model="queryParams.receiverId"
-                        :end-placeholder="$t('common.endDate')"
+          placeholder="请输入目标用户ID"
-                        :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="目标用户账户编号" prop="receiverAccount">
+        <el-input
+          v-model="queryParams.receiverAccount"
+          placeholder="请输入目标用户账户编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            $t('common.search')
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          }}
-        </el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button
-                   v-hasPermi="['business:recordTransaction:add']">{{ $t('common.add') }}
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:recordTransaction:add']"
+        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+        <el-button
-                   v-hasPermi="['business:recordTransaction:edit']">{{ $t('common.edit') }}
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:recordTransaction:edit']"
+        >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+        <el-button
-                   v-hasPermi="['business:recordTransaction:remove']">{{ $t('common.delete') }}
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:recordTransaction:remove']"
+        >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+        <el-button
-                   v-hasPermi="['business:recordTransaction:export']">{{ $t('common.export') }}
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:recordTransaction:export']"
+        >导出
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -59,121 +99,125 @@
 
     <el-table v-loading="loading" :data="recordTransactionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-
+      <el-table-column label="动账记录id" align="center" prop="id" v-if="true"/>
-      <el-table-column :label="$t('business.recordTransaction.senderId')" align="center" prop="senderId"/>
+      <el-table-column label="用户ID" align="center" prop="senderId"/>
-<!--      <el-table-column :label="$t('business.recordTransaction.transactionType')" align="center" prop="type">-->
+      <el-table-column label="账户编号" align="center" prop="senderAccount"/>
-<!--        <template slot-scope="scope">-->
+      <el-table-column label="账单编码" align="center" prop="billCode"/>
-<!--          <el-tag v-if="scope.row.type == 'BT'">{{ $t('business.recordTransaction.transfer') }}</el-tag>-->
+      <el-table-column label="交易类型" align="center" prop="type"/>
-<!--          <el-tag v-if="scope.row.type == 'BP'">{{ $t('business.recordTransaction.payment') }}</el-tag>-->
+      <el-table-column label="目标用户ID" align="center" prop="receiverId"/>
-<!--          <el-tag v-if="scope.row.type == 'BC'">{{ $t('business.recordTransaction.withdraw') }}</el-tag>-->
+      <el-table-column label="目标用户账户编号" align="center" prop="receiverAccount"/>
-<!--          <el-tag v-if="scope.row.type == 'BR'">{{ $t('business.recordTransaction.receive') }}</el-tag>-->
+      <el-table-column label="交易前金额" align="center" prop="previousBalance"/>
-<!--          <el-tag v-if="scope.row.type == 'BU'">{{ $t('business.recordTransaction.recharge') }}</el-tag>-->
+      <el-table-column label="动账金额" align="center" prop="changeBalance"/>
-<!--        </template>-->
+      <el-table-column label="当前金额" align="center" prop="currentBalance"/>
-<!--      </el-table-column>-->
+      <el-table-column label="状态" align="center" prop="status"/>
-      <el-table-column :label="$t('business.recordTransaction.receiverId')" align="center" prop="receiverId"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column :label="$t('business.recordTransaction.previousBalance')" align="center" prop="previousBalance"/>
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-      <el-table-column :label="$t('business.recordTransaction.changeBalance')" align="center" prop="changeBalance"/>
-      <el-table-column :label="$t('business.recordTransaction.currentBalance')" align="center" prop="currentBalance"/>
-      <el-table-column :label="$t('business.recordTransaction.note')" align="center" prop="note"/>
-      <el-table-column :label="$t('business.recordTransaction.transactionTime')" align="center" prop="time" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-<!--      <el-table-column :label="$t('business.recordTransaction.status')" align="center" prop="status">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-tag v-if="scope.row.status == '0'">{{ $t('business.recordTransaction.normal') }}</el-tag>-->
-<!--          <el-tag type="danger" v-if="scope.row.status == '1'">{{ $t('business.recordTransaction.banned') }}</el-tag>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column :label="$t('common.createTime')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <el-button
-        </template>
+            size="mini"
-      </el-table-column>
+            type="text"
-      <el-table-column :label="$t('common.operation')" align="center" width="200"
+            icon="el-icon-view"
-                       class-name="small-padding fixed-width">
+            @click="handleDetail(scope.row)"
-        <template slot-scope="scope">
+          >详情
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">{{
-              $t('common.detail')
-            }}
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button
-                     v-hasPermi="['business:recordTransaction:edit']">{{ $t('common.edit') }}
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:recordTransaction:edit']"
+          >修改
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button
-                     v-hasPermi="['business:recordTransaction:remove']">{{ $t('common.delete') }}
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:recordTransaction:remove']"
+          >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination
-                @pagination="getList"/>
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改交易动账记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.recordTransaction.senderId')" prop="senderId">
+        <el-form-item label="用户ID" prop="senderId">
-          <el-input v-model="form.senderId"
+          <el-input v-model="form.senderId" placeholder="请输入用户ID"/>
-                    :placeholder="$t('business.recordTransaction.senderAccountPlaceholder')"/>
+        </el-form-item>
+        <el-form-item label="账户编号" prop="senderAccount">
+          <el-input v-model="form.senderAccount" placeholder="请输入账户编号"/>
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.receiverId')" prop="receiverId">
+        <el-form-item label="账单编码" prop="billCode">
-          <el-input v-model="form.receiverId"
+          <el-input v-model="form.billCode" placeholder="请输入账单编码"/>
-                    :placeholder="$t('business.recordTransaction.receiverAccountPlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.previousBalance')" prop="previousBalance">
+        <el-form-item label="目标用户ID" prop="receiverId">
-          <el-input v-model="form.previousBalance"
+          <el-input v-model="form.receiverId" placeholder="请输入目标用户ID"/>
-                    :placeholder="$t('business.recordTransaction.previousBalancePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.changeBalance')" prop="changeBalance">
+        <el-form-item label="目标用户账户编号" prop="receiverAccount">
-          <el-input v-model="form.changeBalance"
+          <el-input v-model="form.receiverAccount" placeholder="请输入目标用户账户编号"/>
-                    :placeholder="$t('business.recordTransaction.changeBalancePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.currentBalance')" prop="currentBalance">
+        <el-form-item label="交易前金额" prop="previousBalance">
-          <el-input v-model="form.currentBalance"
+          <el-input v-model="form.previousBalance" placeholder="请输入交易前金额"/>
-                    :placeholder="$t('business.recordTransaction.currentBalancePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.note')" prop="note">
+        <el-form-item label="动账金额" prop="changeBalance">
-          <el-input v-model="form.note" type="textarea"
+          <el-input v-model="form.changeBalance" placeholder="请输入动账金额"/>
-                    :placeholder="$t('business.recordTransaction.notePlaceholder')"/>
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.transactionTime')" prop="time">
+        <el-form-item label="当前金额" prop="currentBalance">
-          <el-date-picker clearable v-model="form.time" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-input v-model="form.currentBalance" placeholder="请输入当前金额"/>
-                          :placeholder="$t('business.recordTransaction.transactionTimePlaceholder')">
+        </el-form-item>
-          </el-date-picker>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 交易动账记录详情 -->
     <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="auto">
-        <el-form-item :label="$t('business.recordTransaction.senderId')">
+        <el-form-item label="用户ID：">
           {{ form.senderId }}
         </el-form-item>
-        <el-form-item label="接收账户id">
+        <el-form-item label="账户编号：">
+          {{ form.senderAccount }}
+        </el-form-item>
+        <el-form-item label="账单编码：">
+          {{ form.billCode }}
+        </el-form-item>
+        <el-form-item label="目标用户ID：">
           {{ form.receiverId }}
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.previousBalance')">
+        <el-form-item label="目标用户账户编号：">
+          {{ form.receiverAccount }}
+        </el-form-item>
+        <el-form-item label="交易前金额：">
           {{ form.previousBalance }}
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.changeBalance')">
+        <el-form-item label="动账金额：">
           {{ form.changeBalance }}
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.currentBalance')">
+        <el-form-item label="当前金额：">
           {{ form.currentBalance }}
         </el-form-item>
-        <el-form-item :label="$t('business.recordTransaction.note')">
+        <el-form-item label="备注：">
-          {{ form.note }}
+          {{ form.remark }}
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">{{ $t('common.close') }}</el-button>
+        <el-button @click="cancel">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -214,31 +258,38 @@ export default {
       open: false,
       // 是否显示详情弹出层
       detailOpen: false,
-      // 状态时间范围
-      daterangeTime: [],
-      // 状态时间范围
-      daterangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         senderId: undefined,
         senderAccount: undefined,
+        billCode: undefined,
         type: undefined,
         receiverId: undefined,
         receiverAccount: undefined,
         previousBalance: undefined,
         changeBalance: undefined,
         currentBalance: undefined,
-        note: undefined,
-        time: undefined,
         status: undefined,
-        createTime: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        senderId: [
+          {required: true, message: "用户ID不能为空", trigger: "blur"}
+        ],
+        senderAccount: [
+          {required: true, message: "账户编号不能为空", trigger: "blur"}
+        ],
+        receiverId: [
+          {required: true, message: "目标用户ID不能为空", trigger: "blur"}
+        ],
+        receiverAccount: [
+          {required: true, message: "目标用户账户编号不能为空", trigger: "blur"}
+        ],
+      }
     };
   },
   created() {
@@ -248,15 +299,6 @@ export default {
     /** 查询交易动账记录列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeTime && '' != this.daterangeTime) {
-        this.queryParams.params["beginTime"] = this.daterangeTime[0];
-        this.queryParams.params["endTime"] = this.daterangeTime[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
       listRecordTransaction(this.queryParams).then(response => {
         this.recordTransactionList = response.rows;
         this.total = response.total;
@@ -275,20 +317,20 @@ export default {
         id: undefined,
         senderId: undefined,
         senderAccount: undefined,
+        billCode: undefined,
         type: undefined,
         receiverId: undefined,
         receiverAccount: undefined,
         previousBalance: undefined,
         changeBalance: undefined,
         currentBalance: undefined,
-        note: undefined,
-        time: undefined,
         status: undefined,
-        delFlag: undefined,
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
-        updateTime: undefined
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
       };
       this.resetForm("form");
     },
@@ -299,8 +341,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.daterangeTime = [];
-      this.daterangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -314,15 +354,14 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = this.$t('business.recordTransaction.addTitle');
+      this.title = "添加交易动账记录";
     },
     /** 详情按钮操作 */
     handleDetail(row) {
       this.reset();
       this.form = row;
-      console.log(row)
       this.detailOpen = true;
-      this.title = this.$t('business.recordTransaction.detailTitle');
+      this.title = "交易动账记录";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -333,7 +372,7 @@ export default {
         this.loading = false;
         this.form = response.data;
         this.open = true;
-        this.title = this.$t('business.recordTransaction.editTitle');
+        this.title = "修改交易动账记录";
       });
     },
     /** 提交按钮 */
@@ -343,7 +382,7 @@ export default {
           this.buttonLoading = true;
           if (this.form.id != null) {
             updateRecordTransaction(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.editSuccess'));
+              this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             }).finally(() => {
@@ -351,7 +390,7 @@ export default {
             });
           } else {
             addRecordTransaction(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('common.addSuccess'));
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             }).finally(() => {
@@ -364,13 +403,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm(this.$t('common.deleteConfirm')).then(() => {
+      this.$modal.confirm('是否确认删除交易动账记录编号为"' + ids + '"的数据项？').then(() => {
         this.loading = true;
         return delRecordTransaction(ids);
       }).then(() => {
         this.loading = false;
         this.getList();
-        this.$modal.msgSuccess(this.$t('common.deleteSuccess'));
+        this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       }).finally(() => {
         this.loading = false;