mall + pay：简化 pay 的复杂度

1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出

Author: YunaiV

src/api/pay/channel.js

@@ -27,16 +27,6 @@ export function deleteChannel(id) {
   })
 }
 
-// 获得支付渠道
-// export function getChannel(id) {
-//   return request({
-//     url: '/pay/channel/get?id=' + id,
-//     method: 'get'
-//   })
-// }
-
-
-
 // 获得支付渠道分页
 export function getChannelPage(query) {
   return request({
@@ -46,22 +36,11 @@ export function getChannelPage(query) {
   })
 }
 
-// 导出支付渠道Excel
-export function exportChannelExcel(query) {
-  return request({
-    url: '/pay/channel/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
 // 获得支付渠道
-export function getChannel(merchantId,appId,code) {
+export function getChannel(appId,code) {
   return request({
     url: '/pay/channel/get-channel',
     params:{
-      merchantId:merchantId,
       appId:appId,
       code:code
     },

src/api/pay/merchant.js

@@ -131,7 +131,6 @@ const defaultForm = {
   remark: '',
   feeRate: null,
   appId: '',
-  merchantId: null,
   aliPayConfig: {
     appId: '',
     serverUrl: null,
@@ -161,13 +160,6 @@ export default {
       "appId": null,
       // 渠道编码
       "payCode": null,
-      // 商户对象
-      "payMerchant": {
-        // 编号
-        "id": null,
-        // 名称
-        "name": null
-      },
     }
   },
   data() {
@@ -249,7 +241,6 @@ export default {
         if (newVal.aliPayOpen) {
           this.form.code = newVal.payCode;
           this.form.appId = newVal.appId;
-          this.form.merchantId = newVal.payMerchant.id;
           // 只有在初次进来为编辑 并且为加载中的时候才回去请求数据
           if (newVal.edit === true && newVal.loading) {
             this.title = "编辑支付渠道";
@@ -264,7 +255,7 @@ export default {
 
   methods: {
     init() {
-      getChannel(this.transferParam.payMerchant.id, this.transferParam.appId, this.transferParam.payCode)
+      getChannel(this.transferParam.appId, this.transferParam.payCode)
         .then(response => {
           this.form.id = response.data.id;
           this.form.feeRate = response.data.feeRate;

src/views/pay/app/components/aliPayChannelForm.vue

@@ -95,7 +95,6 @@ const defaultForm = {
   remark: '',
   feeRate: null,
   appId: '',
-  merchantId: null,
   weChatConfig: {
     appId: '',
     mchId: '',
@@ -123,13 +122,6 @@ export default {
       "appId": null,
       // 渠道编码
       "payCode": null,
-      // 商户对象
-      "payMerchant": {
-        // 编号
-        "id": null,
-        // 名称
-        "name": null
-      },
     }
   },
   data() {
@@ -200,7 +192,6 @@ export default {
         if (newVal.wechatOpen) {
           this.form.code = newVal.payCode;
           this.form.appId = newVal.appId;
-          this.form.merchantId = newVal.payMerchant.id;
           // 只有在初次进来为编辑 并且为加载中的时候才回去请求数据
           if (newVal.edit && newVal.loading) {
             this.title = "编辑支付渠道";
@@ -214,7 +205,7 @@ export default {
   },
   methods: {
     init() {
-      getChannel(this.transferParam.payMerchant.id, this.transferParam.appId, this.transferParam.payCode)
+      getChannel(this.transferParam.appId, this.transferParam.payCode)
         .then(response => {
           this.form.id = response.data.id;
           this.form.feeRate = response.data.feeRate;

src/views/pay/app/components/wechatChannelForm.vue

@@ -7,10 +7,6 @@
         <el-input v-model="queryParams.name" placeholder="请输入应用名" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="商户名称" prop="merchantName">
-        <el-input v-model="queryParams.merchantName" placeholder="请输入商户名称" clearable
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable>
           <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label"
@@ -34,11 +30,6 @@
                    v-hasPermi="['pay:app:create']">新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   v-hasPermi="['pay:app:export']">导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -174,23 +165,6 @@
         <el-form-item label="应用名" prop="name">
           <el-input v-model="form.name" placeholder="请输入应用名"/>
         </el-form-item>
-        <el-form-item label="所属商户" prop="merchantId">
-          <el-select
-            v-model="form.merchantId"
-            filterable
-            remote
-            reserve-keyword
-            placeholder="请选择所属商户"
-            :remote-method="handleGetMerchantListByName"
-            :loading="loading">
-            <el-option
-              v-for="item in merchantList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="开启状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
@@ -221,10 +195,9 @@
 </template>
 
 <script>
-import {createApp, updateApp, changeAppStatus, deleteApp, getApp, getAppPage, exportAppExcel} from "@/api/pay/app";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {PayType, PayChannelEnum, CommonStatusEnum} from "@/utils/constants";
-import {getMerchantListByName} from "@/api/pay/merchant";
+import { createApp, updateApp, changeAppStatus, deleteApp, getApp, getAppPage } from "@/api/pay/app";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { PayType, PayChannelEnum, CommonStatusEnum } from "@/utils/constants";
 import wechatChannelForm from "@/views/pay/app/components/wechatChannelForm";
 import aliPayChannelForm from "@/views/pay/app/components/aliPayChannelForm";
 
@@ -254,10 +227,6 @@ export default {
         pageSize: 10,
         name: null,
         status: null,
-        remark: null,
-        payNotifyUrl: null,
-        refundNotifyUrl: null,
-        merchantName: null,
         createTime: []
       },
       // 表单参数
@@ -268,7 +237,6 @@ export default {
         status: [{required: true, message: "开启状态不能为空", trigger: "blur"}],
         payNotifyUrl: [{required: true, message: "支付结果的回调地址不能为空", trigger: "blur"}],
         refundNotifyUrl: [{required: true, message: "退款结果的回调地址不能为空", trigger: "blur"}],
-        merchantId: [{required: true, message: "商户编号不能为空", trigger: "blur"}],
       },
       // 数据字典
       statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
@@ -277,8 +245,6 @@ export default {
       payChannelEnum: PayChannelEnum,
       // 支付类型
       payType: PayType,
-      // 商户列表
-      merchantList: [],
       // 是否显示支付窗口
       payOpen: false,
       // 微信组件传参参数
@@ -305,7 +271,6 @@ export default {
   },
   created() {
     this.getList();
-    this.handleGetMerchantListByName(null);
   },
   methods: {
     /** 查询列表 */
@@ -332,7 +297,6 @@ export default {
         remark: undefined,
         payNotifyUrl: undefined,
         refundNotifyUrl: undefined,
-        merchantId: undefined,
       };
       this.resetForm("form");
     },
@@ -411,36 +375,13 @@ export default {
         });
       });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有支付应用信息数据项?').then(function () {
-        return exportAppExcel(params);
-      }).then(response => {
-        this.$download.excel(response, '支付应用信息.xls');
-      }).catch(() => {});
-    },
-    /**
-     * 根据商户名称模糊匹配商户信息
-     * @param name 商户名称
-     */
-    handleGetMerchantListByName(name) {
-      getMerchantListByName(name).then(response => {
-        this.merchantList = response.data;
-      });
-    },
     /**
      * 修改支付渠道信息
      */
     handleUpdateChannel(row, payCode, type) {
       this.settingChannelParam(row, payCode, type)
       this.channelParam.edit = true;
       this.channelParam.loading = true;
-
     },
     /**
      * 新增支付渠道信息
@@ -475,9 +416,6 @@ export default {
      */
     judgeChannelExist(channels, channelCode) {
       return channels.indexOf(channelCode) !== -1;
-    },
-    refreshTable() {
-      this.getList();
     }
   }
 };

src/views/pay/app/index.vue

@@ -79,7 +79,6 @@
 
 <script>
 import {createDemoOrder, getDemoOrderPage, refundDemoOrder} from "@/api/pay/demo";
-import {deleteMerchant} from "@/api/pay/merchant";
 
 export default {
   name: "PayDemoOrder",