From 9074312fe301b54a093448427209529622e7b4d9 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Wed, 6 Sep 2023 10:34:24 +0800
Subject: [PATCH] 后台接入钱包支付

---
 yudao-ui-admin/src/utils/constants.js                                 |   4 ++++
 yudao-ui-admin/src/views/pay/app/components/mockChannelForm.vue       | 107 -----------------------------------------------------------------------------------------------------------
 yudao-ui-admin/src/views/pay/app/components/noneConfigChannelForm.vue | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 yudao-ui-admin/src/views/pay/app/index.vue                            |  25 +++++++++++++++++++++----
 yudao-ui-admin/src/views/pay/cashier/index.vue                        |   4 ++++
 5 files changed, 137 insertions(+), 111 deletions(-)
 delete mode 100644 yudao-ui-admin/src/views/pay/app/components/mockChannelForm.vue
 create mode 100644 yudao-ui-admin/src/views/pay/app/components/noneConfigChannelForm.vue

diff --git a/yudao-ui-admin/src/utils/constants.js b/yudao-ui-admin/src/utils/constants.js
index d62b1f8..2ce6d00 100644
--- a/yudao-ui-admin/src/utils/constants.js
+++ b/yudao-ui-admin/src/utils/constants.js
@@ -163,6 +163,10 @@ export const PayChannelEnum = {
   MOCK : {
     "code": "mock",
     "name": "模拟支付"
+  },
+  WALLET : {
+    "code": "wallet",
+    "name": "钱包支付"
   }
 }
 
diff --git a/yudao-ui-admin/src/views/pay/app/components/mockChannelForm.vue b/yudao-ui-admin/src/views/pay/app/components/mockChannelForm.vue
deleted file mode 100644
index e2d6162..0000000
--- a/yudao-ui-admin/src/views/pay/app/components/mockChannelForm.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div>
-    <el-dialog :visible.sync="dialogVisible" :title="title" @closed="close" append-to-body width="800px">
-      <el-form ref="form" :model="formData" :rules="rules" size="medium" label-width="100px" v-loading="formLoading">
-        <el-form-item label-width="180px" label="渠道状态" prop="status">
-          <el-radio-group v-model="formData.status" size="medium">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
-                      :label="parseInt(dict.value)">
-              {{ dict.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label-width="180px" label="备注" prop="remark">
-          <el-input v-model="formData.remark" :style="{width: '100%'}"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="close">取消</el-button>
-        <el-button type="primary" @click="submitForm">确定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { createChannel, getChannel, updateChannel } from "@/api/pay/channel";
-import { CommonStatusEnum } from "@/utils/constants";
-
-export default {
-  name: "mockChannelForm",
-  data() {
-    return {
-      dialogVisible: false,
-      formLoading: false,
-      title:'',
-      formData: {
-        appId: '',
-        code: '',
-        status: undefined,
-        feeRate: 0,
-        remark: '',
-        config: {
-          name: 'mock-conf'
-        }
-      },
-      rules: {
-        status: [{ required: true,  message: '渠道状态不能为空',  trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    open(appId, code) {
-      this.dialogVisible = true;
-      this.formLoading = true;
-      this.reset(appId, code);
-      getChannel(appId, code).then(response => {
-        if (response.data && response.data.id) {
-          this.formData = response.data;
-          this.formData.config = JSON.parse(response.data.config);
-        }
-        this.title = !this.formData.id ? '创建支付渠道' : '编辑支付渠道'
-      }).finally(() => {
-        this.formLoading = false;
-      });
-    },
-    close() {
-      this.dialogVisible = false;
-      this.reset(undefined, undefined);
-    },
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (!valid) {
-          return
-        }
-        const data = { ...this.formData };
-        data.config = JSON.stringify(this.formData.config);
-        if (!data.id) {
-          createChannel(data).then(response => {
-            this.$modal.msgSuccess("新增成功");
-            this.$emit('success')
-            this.close();
-          });
-        } else {
-          updateChannel(data).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.$emit('success')
-            this.close();
-          })
-        }
-      });
-    },
-    /** 重置表单 */
-    reset(appId, code) {
-      this.formData = {
-        appId: appId,
-        code: code,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: 0,
-        config: {
-          name: 'mock-conf'
-        }
-      }
-      this.resetForm('form')
-    },
-  }
-}
-</script>
diff --git a/yudao-ui-admin/src/views/pay/app/components/noneConfigChannelForm.vue b/yudao-ui-admin/src/views/pay/app/components/noneConfigChannelForm.vue
new file mode 100644
index 0000000..51fcc53
--- /dev/null
+++ b/yudao-ui-admin/src/views/pay/app/components/noneConfigChannelForm.vue
@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="dialogVisible" :title="title" @closed="close" append-to-body width="800px">
+      <el-form ref="form" :model="formData" :rules="rules" size="medium" label-width="100px" v-loading="formLoading">
+        <el-form-item label-width="180px" label="渠道状态" prop="status">
+          <el-radio-group v-model="formData.status" size="medium">
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
+                      :label="parseInt(dict.value)"
+            >
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label-width="180px" label="备注" prop="remark">
+          <el-input v-model="formData.remark" :style="{width: '100%'}"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="submitForm">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { createChannel, getChannel, updateChannel } from '@/api/pay/channel'
+import { CommonStatusEnum } from '@/utils/constants'
+
+export default {
+  name: 'noneConfigChannelForm',
+  data() {
+    return {
+      dialogVisible: false,
+      formLoading: false,
+      title: '',
+      formData: {
+        appId: '',
+        code: '',
+        status: undefined,
+        feeRate: 0,
+        remark: '',
+        config: {
+          name: 'none-config'
+        }
+      },
+      rules: {
+        status: [{ required: true, message: '渠道状态不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    open(appId, code) {
+      this.dialogVisible = true
+      this.formLoading = true
+      this.reset(appId, code)
+      getChannel(appId, code).then(response => {
+        if (response.data && response.data.id) {
+          this.formData = response.data
+          this.formData.config = JSON.parse(response.data.config)
+        }
+        this.title = !this.formData.id ? '创建支付渠道' : '编辑支付渠道'
+      }).finally(() => {
+        this.formLoading = false
+      })
+    },
+    close() {
+      this.dialogVisible = false
+      this.reset(undefined, undefined)
+    },
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (!valid) {
+          return
+        }
+        const data = { ...this.formData }
+        data.config = JSON.stringify(this.formData.config)
+        if (!data.id) {
+          createChannel(data).then(response => {
+            this.$modal.msgSuccess('新增成功')
+            this.$emit('success')
+            this.close()
+          })
+        } else {
+          updateChannel(data).then(response => {
+            this.$modal.msgSuccess('修改成功')
+            this.$emit('success')
+            this.close()
+          })
+        }
+      })
+    },
+    /** 重置表单 */
+    reset(appId, code) {
+      this.formData = {
+        appId: appId,
+        code: code,
+        status: CommonStatusEnum.ENABLE,
+        remark: '',
+        feeRate: 0,
+        config: {
+          name: 'none-config'
+        }
+      }
+      this.resetForm('form')
+    }
+  }
+}
+</script>
diff --git a/yudao-ui-admin/src/views/pay/app/index.vue b/yudao-ui-admin/src/views/pay/app/index.vue
index 67a15fe..6819af7 100644
--- a/yudao-ui-admin/src/views/pay/app/index.vue
+++ b/yudao-ui-admin/src/views/pay/app/index.vue
@@ -170,6 +170,19 @@
           </template>
         </el-table-column>
       </el-table-column>
+      <el-table-column label="钱包支付配置" align="center">
+        <el-table-column :label="payChannelEnum.WALLET.name" align="center">
+          <template v-slot="scope">
+            <el-button type="success" icon="el-icon-check" circle
+                       v-if="isChannelExists(scope.row.channelCodes, payChannelEnum.WALLET.code)"
+                       @click="handleChannel(scope.row, payChannelEnum.WALLET.code)">
+            </el-button>
+            <el-button v-else type="danger" icon="el-icon-close" circle
+                       @click="handleChannel(scope.row, payChannelEnum.WALLET.code)">
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -219,7 +232,7 @@
     <!-- 对话框（支付应用的配置） -->
     <weixin-channel-form ref="weixinChannelFormRef" @success="getList" />
     <alipay-channel-form ref="alipayChannelFormRef" @success="getList" />
-    <mock-channel-form ref="mockChannelFormRef" @success="getList" />
+    <none-config-channel-form ref="noneConfigChannelFormRef" @success="getList" />
   </div>
 </template>
 
@@ -228,14 +241,14 @@ import { createApp, updateApp, changeAppStatus, deleteApp, getApp, getAppPage } 
 import { PayChannelEnum, CommonStatusEnum } from "@/utils/constants";
 import weixinChannelForm from "@/views/pay/app/components/weixinChannelForm";
 import alipayChannelForm from "@/views/pay/app/components/alipayChannelForm";
-import mockChannelForm from '@/views/pay/app/components/mockChannelForm';
+import noneConfigChannelForm from '@/views/pay/app/components/noneConfigChannelForm';
 
 export default {
   name: "PayApp",
   components: {
     weixinChannelForm,
     alipayChannelForm,
-    mockChannelForm
+    noneConfigChannelForm
   },
   data() {
     return {
@@ -391,7 +404,11 @@ export default {
         return
       }
       if (code === 'mock') {
-        this.$refs['mockChannelFormRef'].open(row.id, code);
+        this.$refs['noneConfigChannelFormRef'].open(row.id, code);
+        return
+      }
+      if (code === 'wallet') {
+        this.$refs['noneConfigChannelFormRef'].open(row.id, code);
         return
       }
     },
diff --git a/yudao-ui-admin/src/views/pay/cashier/index.vue b/yudao-ui-admin/src/views/pay/cashier/index.vue
index 85d7027..c10c154 100644
--- a/yudao-ui-admin/src/views/pay/cashier/index.vue
+++ b/yudao-ui-admin/src/views/pay/cashier/index.vue
@@ -136,6 +136,10 @@ export default {
         name: '模拟支付',
         icon: require("@/assets/images/pay/icon/mock.svg"),
         code: "mock"
+      }, {
+          name: '钱包支付',
+          icon: require("@/assets/images/pay/icon/mock.svg"),
+          code: "wallet"
       }],
       submitLoading: false, // 提交支付的 loading
       interval: undefined, // 定时任务，轮询是否完成支付
--
libgit2 0.21.4