From 95c6f55dee39344ddcdafa4c094e916aca3eb60f Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Sun, 24 Nov 2024 17:15:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(daxpay):=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 AllocationGroupEdit 和 AllocationReceiverEdit组件，使用 unref 获取 appId值
- 更新 AllocationReceiver.api.ts，添加 reqTime 字段- 调整 PayOrder.api.ts 中的分账接口，使用 id 替代 orderNo
- 优化 PayOrderList 组件中的分账逻辑
- 移除 MchAppList 组件中的分账配置选项
- 更新 DevelopTradePay 组件，增加是否分账的开关
- 在 ChannelConstList 组件中添加支持分账的列
---
 .../allocation/group/AllocationGroupEdit.vue  |  7 ++++--
 .../allocation/group/AllocationGroupList.vue  |  2 +-
 .../receiver/AllocationReceiver.api.ts        |  2 ++
 .../receiver/AllocationReceiverEdit.vue       |  6 +++--
 .../receiver/AllocationReceiverList.vue       | 10 ++++----
 .../constant/channel/ChannelConstList.vue     |  6 +++++
 .../common/develop/trade/DevelopTradePay.vue  |  8 +++++++
 .../daxpay/common/merchant/app/MchAppList.vue |  6 ++---
 .../daxpay/common/order/pay/PayOrder.api.ts   |  4 ++--
 .../daxpay/common/order/pay/PayOrderList.vue  | 23 +++++++++----------
 10 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
index 9ede7452..67343e23 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import { computed, nextTick, ref } from 'vue'
+  import { computed, nextTick, ref, unref } from "vue";
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { get, add, update, AllocGroup, existsByNo } from './AllocationGroup.api'
   import { FormEditType } from '@/enums/formTypeEnum'
@@ -114,7 +114,7 @@
     initFormEditType(editType)
     resetForm()
     initData()
-    form.value.appId = appId
+    form.value.appId = unref(appId)
     getInfo(record, editType)
   }
 
@@ -161,6 +161,9 @@
    */
   async function validateCode() {
     const { groupNo, appId } = form.value
+    if (!addable.value) {
+      return Promise.resolve()
+    }
     const res = await existsByNo(groupNo, appId)
     return res.data ? Promise.reject('该分账组编号已经存在') : Promise.resolve()
   }
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
index 7d8d9aed..19aad6aa 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
@@ -184,7 +184,7 @@
    * 新建
    */
   function add() {
-    allocationGroupEdit.value.init(null, FormEditType.Add, appId)
+    allocationGroupEdit.value.init(null, FormEditType.Add, appId.value)
   }
 
   /**
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
index 69b4ab82..835a964a 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
@@ -100,4 +100,6 @@ export interface AllocReceiver extends MchEntity {
   relationType?: string
   // 关系名称
   relationName?: string
+  // 请求时间
+  reqTime?: string
 }
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
index 90883895..98bf3d2a 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
@@ -107,7 +107,7 @@
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { useMessage } from '@/hooks/web/useMessage'
-  import { computed, nextTick, ref } from 'vue'
+  import { computed, nextTick, ref, unref } from "vue";
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import {
     add,
@@ -124,6 +124,7 @@
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { Icon } from '@/components/Icon'
   import OpenIdQrCode from './OpenIdQrCode.vue'
+  import XEUtils from 'xe-utils'
 
   const {
     initFormEditType,
@@ -177,7 +178,7 @@
   function init(record, editType: FormEditType, appId) {
     initFormEditType(editType)
     resetForm()
-    form.value.appId = appId
+    form.value.appId = unref(appId)
     initData()
     getInfo(record, editType)
   }
@@ -226,6 +227,7 @@
     formRef.value?.validate().then(async () => {
       confirmLoading.value = true
       try {
+        form.value.reqTime = XEUtils.toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss')
         if (formEditType.value === FormEditType.Add) {
           await add(form.value)
         } else if (formEditType.value === FormEditType.Edit) {
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
index 30e261b3..4f053c44 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
@@ -41,7 +41,7 @@
             <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
           </template>
         </vxe-column>
-        <vxe-column field="channel" title="所属通道" :min-width="120" align="center">
+        <vxe-column field="channel" title="所属通道" :min-width="150" align="center">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
           </template>
@@ -75,7 +75,7 @@
         @page-change="handleTableChange"
       />
     </div>
-    <allocation-receiver-edit ref="allocationReceiverEdit" @ok="queryPage" />
+    <AllocationReceiverEdit ref="allocationReceiverEdit" @ok="queryPage" />
   </basic-drawer>
 </template>
 
@@ -127,21 +127,21 @@
         type: LIST,
         name: '分账通道',
         placeholder: '请选择分账通道',
-        selectList: payChannelList,
+        selectList: payChannelList.value,
       },
       {
         field: 'allocReceiverType',
         type: LIST,
         name: '接收方类型',
         placeholder: '请选择接收方类型',
-        selectList: receiverTypeList,
+        selectList: receiverTypeList.value,
       },
       {
         field: 'relationType',
         type: LIST,
         name: '分账关系',
         placeholder: '请选择分账关系',
-        selectList: relationTypeList,
+        selectList: relationTypeList.value,
       },
     ] as QueryField[]
   })
diff --git a/src/views/daxpay/common/constant/channel/ChannelConstList.vue b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
index 14bc878a..1ae5a032 100644
--- a/src/views/daxpay/common/constant/channel/ChannelConstList.vue
+++ b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
@@ -27,6 +27,12 @@
               <a-tag v-else color="red">停用</a-tag>
             </template>
           </vxe-column>
+          <vxe-column field="enable" title="支持分账">
+            <template #default="{ row }">
+              <a-tag v-if="row.enable" color="green">支持</a-tag>
+              <a-tag v-else color="red">不支持</a-tag>
+            </template>
+          </vxe-column>
           <vxe-column field="remark" title="备注" />
         </vxe-table>
       </div>
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index 44ad905e..ca16f431 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -55,6 +55,13 @@
             placeholder="请选择支付方式"
           />
         </a-form-item>
+        <a-form-item label="是否分账" name="allocation">
+          <a-switch
+            checked-children="是"
+            un-checked-children="否"
+            v-model:checked="form.allocation"
+          />
+        </a-form-item>
         <a-form-item label="支付描述" name="description">
           <a-input v-model:value="form.description" placeholder="请输入支付描述" />
         </a-form-item>
@@ -150,6 +157,7 @@
       title: [{ required: true, message: '支付标题不可为空' }],
       amount: [{ required: true, message: '支付金额不可为空' }],
       method: [{ required: true, message: '支付方式不可为空' }],
+      allocation: [{ required: true, message: '分账不可为空' }],
       clientIp: [{ required: true, message: '终端IP不可为空' }],
       nonceStr: [{ required: true, message: '随机数不可为空' }],
       reqTime: [{ required: true, message: '请求时间不可为空' }],
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 33532c42..3de9558b 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -67,9 +67,9 @@
                     <a-menu-item>
                       <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
-                    <a-menu-item>
-                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
-                    </a-menu-item>
+<!--                    <a-menu-item>-->
+<!--                      <a-link @click="showAllocConfig(row)">分账配置</a-link>-->
+<!--                    </a-menu-item>-->
                     <a-menu-item>
                       <a-link @click="showAllocReceiver(row)">分账接收方</a-link>
                     </a-menu-item>
diff --git a/src/views/daxpay/common/order/pay/PayOrder.api.ts b/src/views/daxpay/common/order/pay/PayOrder.api.ts
index 774a49f2..913b6b8e 100644
--- a/src/views/daxpay/common/order/pay/PayOrder.api.ts
+++ b/src/views/daxpay/common/order/pay/PayOrder.api.ts
@@ -70,10 +70,10 @@ export function cancel(id) {
 /**
  * 触发分账
  */
-export function allocByOrderNo(orderNo) {
+export function allocation(id) {
   return defHttp.post<Result<void>>({
     url: '/order/pay/allocation',
-    params: { orderNo },
+    params: { id },
   })
 }
 
diff --git a/src/views/daxpay/common/order/pay/PayOrderList.vue b/src/views/daxpay/common/order/pay/PayOrderList.vue
index af5cc7ba..57cd4d39 100644
--- a/src/views/daxpay/common/order/pay/PayOrderList.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderList.vue
@@ -99,7 +99,7 @@
                         PayStatusEnum.SUCCESS === row.status
                       "
                     >
-                      <a-link @click="allocation(row)">分账</a-link>
+                      <a-link @click="allocationOrder(row)">分账</a-link>
                     </a-menu-item>
                     <a-menu-item
                       v-if="
@@ -135,9 +135,9 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref, watch } from 'vue'
+  import { computed, onMounted, ref } from 'vue'
   import {
-    allocByOrderNo,
+    allocation,
     close,
     getTotalAmount,
     page,
@@ -340,29 +340,28 @@
       },
     })
   }
-  /**
-   * 退款
-   */
-  function refund(record) {
-    refundModel.value.init(record.id)
-  }
-
   /**
    * 触发分账
    */
-  function allocation(record) {
+  function allocationOrder(record) {
     createConfirm({
       iconType: 'warning',
       title: '警告',
       content: '是否触发该订单的分账操作',
       onOk: () => {
-        allocByOrderNo(record.orderNo).then(() => {
+        allocation(record.id).then(() => {
           createMessage.success('分账请求已发送')
           queryPage()
         })
       },
     })
   }
+  /**
+   * 退款
+   */
+  function refund(record) {
+    refundModel.value.init(record.id)
+  }
 </script>
 
 <style lang="less" scoped></style>