Merge remote-tracking branch 'origin/dev' into dev

YunaiV · YunaiV · commit ce78336fca17 · 2023-09-24T12:10:14.000+08:00
diff --git a/src/api/mall/trade/brokerage/withdraw/index.ts b/src/api/mall/trade/brokerage/withdraw/index.ts
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface BrokerageWithdrawVO {
+  id: number
+  userId: number
+  price: number
+  feePrice: number
+  totalPrice: number
+  type: number
+  name: string
+  accountNo: string
+  bankName: string
+  bankAddress: string
+  accountQrCodeUrl: string
+  status: number
+  auditReason: string
+  auditTime: Date
+  remark: string
+}
+
+// 查询佣金提现列表
+export const getBrokerageWithdrawPage = async (params: any) => {
+  return await request.get({ url: `/trade/brokerage-withdraw/page`, params })
+}
+
+// 查询佣金提现详情
+export const getBrokerageWithdraw = async (id: number) => {
+  return await request.get({ url: `/trade/brokerage-withdraw/get?id=` + id })
+}
+
+// 佣金提现 - 通过申请
+export const approveBrokerageWithdraw = async (id: number) => {
+  return await request.put({ url: `/trade/brokerage-withdraw/approve?id=` + id })
+}
+
+// 审核佣金提现 - 驳回申请
+export const rejectBrokerageWithdraw = async (data: BrokerageWithdrawVO) => {
+  return await request.put({ url: `/trade/brokerage-withdraw/reject`, data })
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -300,32 +300,61 @@ export const BrokerageEnabledConditionEnum = {
   }
 }
 /**
- * 分销用户类型枚举
+ * 佣金记录业务类型枚举
  */
-export const BrokerageUserTypeEnum = {
-  ALL: {
-    type: 0,
-    name: '全部'
-  },
-  FIRST: {
+export const BrokerageRecordBizTypeEnum = {
+  ORDER: {
     type: 1,
-    name: '一级推广人'
+    name: '获得推广佣金'
   },
-  SECOND: {
+  WITHDRAW: {
     type: 2,
-    name: '二级推广人'
+    name: '提现申请'
   }
 }
 /**
- * 佣金记录业务类型枚举
+ * 佣金提现状态枚举
  */
-export const BrokerageRecordBizTypeEnum = {
-  ORDER: {
+export const BrokerageWithdrawStatusEnum = {
+  AUDITING: {
+    status: 0,
+    name: '审核中'
+  },
+  AUDIT_SUCCESS: {
+    status: 10,
+    name: '审核通过'
+  },
+  AUDIT_FAIL: {
+    status: 20,
+    name: '审核不通过'
+  },
+  WITHDRAW_SUCCESS: {
+    status: 11,
+    name: '提现成功'
+  },
+  WITHDRAW_FAIL: {
+    status: 21,
+    name: '提现失败'
+  }
+}
+/**
+ * 佣金提现类型枚举
+ */
+export const BrokerageWithdrawTypeEnum = {
+  WALLET: {
     type: 1,
-    name: '获得推广佣金'
+    name: '钱包'
   },
-  WITHDRAW: {
+  BANK: {
     type: 2,
-    name: '提现申请'
+    name: '银行卡'
+  },
+  WECHAT: {
+    type: 3,
+    name: '微信'
+  },
+  ALIPAY: {
+    type: 4,
+    name: '支付宝'
   }
 }
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
@@ -168,9 +168,10 @@ export enum DICT_TYPE {
   BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition', // 分佣模式
   BROKERAGE_BIND_MODE = 'brokerage_bind_mode', // 分销关系绑定模式
   BROKERAGE_BANK_NAME = 'brokerage_bank_name', // 佣金提现银行
-  BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金冻结时间
+  BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金提现类型
   BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
   BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
+  BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
 
   // ========== MALL - 营销模块 ==========
   PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
diff --git a/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue b/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
@@ -9,15 +9,11 @@
         :inline="true"
         label-width="85px"
       >
-        <el-form-item label="用户类型" prop="userType">
-          <el-radio-group v-model="queryParams.userType" @change="handleQuery">
-            <el-radio-button
-              v-for="item in BrokerageUserTypeEnum"
-              :key="item.type"
-              :label="item.type"
-            >
-              {{ item.name }}
-            </el-radio-button>
+        <el-form-item label="用户类型" prop="level">
+          <el-radio-group v-model="queryParams.level" @change="handleQuery">
+            <el-radio-button checked>全部</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -98,7 +94,7 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as BrokerageRecordApi from '@/api/mall/trade/brokerage/record'
-import { BrokerageRecordBizTypeEnum, BrokerageUserTypeEnum } from '@/utils/constants'
+import { BrokerageRecordBizTypeEnum } from '@/utils/constants'
 import { fenToYuanFormat } from '@/utils/formatter'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
@@ -115,14 +111,15 @@ const queryParams = reactive({
   pageSize: 10,
   userId: null,
   bizType: BrokerageRecordBizTypeEnum.ORDER.type,
-  userType: BrokerageUserTypeEnum.ALL.type,
-  createTime: []
+  level: '',
+  createTime: [],
+  status: null
 })
 const queryFormRef = ref() // 搜索的表单
 
 /** 打开弹窗 */
 const dialogVisible = ref(false) // 弹窗的是否展示
-const open = async (userId: number) => {
+const open = async (userId: any) => {
   dialogVisible.value = true
   queryParams.userId = userId
   resetQuery()
diff --git a/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue b/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
@@ -9,15 +9,11 @@
         :inline="true"
         label-width="85px"
       >
-        <el-form-item label="用户类型" prop="userType">
-          <el-radio-group v-model="queryParams.userType" @change="handleQuery">
-            <el-radio-button
-              v-for="item in BrokerageUserTypeEnum"
-              :key="item.type"
-              :label="item.type"
-            >
-              {{ item.name }}
-            </el-radio-button>
+        <el-form-item label="用户类型" prop="level">
+          <el-radio-group v-model="queryParams.level" @change="handleQuery">
+            <el-radio-button checked>全部</el-radio-button>
+            <el-radio-button label="1">一级推广人</el-radio-button>
+            <el-radio-button label="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="绑定时间" prop="bindUserTime">
@@ -88,7 +84,6 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
-import { BrokerageUserTypeEnum } from '@/utils/constants'
 
 /** 推广人列表 */
 defineOptions({ name: 'BrokerageUserListDialog' })
@@ -102,14 +97,14 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   bindUserId: null,
-  userType: BrokerageUserTypeEnum.ALL.type,
+  level: '',
   bindUserTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 
 /** 打开弹窗 */
 const dialogVisible = ref(false) // 弹窗的是否展示
-const open = async (bindUserId: number) => {
+const open = async (bindUserId: any) => {
   dialogVisible.value = true
   queryParams.bindUserId = bindUserId
   resetQuery()
diff --git a/src/views/mall/trade/brokerage/withdraw/BrokerageWithdrawRejectForm.vue b/src/views/mall/trade/brokerage/withdraw/BrokerageWithdrawRejectForm.vue
@@ -0,0 +1,73 @@
+<template>
+  <Dialog title="审核" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="驳回原因" prop="auditReason">
+        <el-input v-model="formData.auditReason" type="textarea" placeholder="请输入驳回原因" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  auditReason: undefined
+})
+const formRules = reactive({
+  auditReason: [{ required: true, message: '驳回原因不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BrokerageWithdrawApi.BrokerageWithdrawVO
+    await BrokerageWithdrawApi.rejectBrokerageWithdraw(data)
+    message.success('驳回成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    auditReason: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mall/trade/brokerage/withdraw/index.vue b/src/views/mall/trade/brokerage/withdraw/index.vue
diff --git a/src/views/mall/trade/config/index.vue b/src/views/mall/trade/config/index.vue
diff --git a/src/views/mall/trade/order/detail/index.vue b/src/views/mall/trade/order/detail/index.vue
