From 35664d1f3296712e741b4f7e93830c4fdd76e799 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Tue, 5 Sep 2023 22:31:35 +0800
Subject: [PATCH 1/6] =?UTF-8?q?trade:=20=E5=A2=9E=E5=8A=A0=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/trade/config/index.ts      |  24 +++
 src/api/member/point/config/index.ts    |  10 --
 src/views/mall/trade/config/index.vue   | 209 ++++++++++++++++++++++++
 src/views/member/point/config/index.vue | 131 +--------------
 4 files changed, 235 insertions(+), 139 deletions(-)
 create mode 100644 src/api/mall/trade/config/index.ts
 create mode 100644 src/views/mall/trade/config/index.vue

diff --git a/src/api/mall/trade/config/index.ts b/src/api/mall/trade/config/index.ts
new file mode 100644
index 00000000..3a1771d8
--- /dev/null
+++ b/src/api/mall/trade/config/index.ts
@@ -0,0 +1,24 @@
+import request from '@/config/axios'
+
+export interface ConfigVO {
+  brokerageEnabled: boolean
+  brokerageEnabledCondition: number
+  brokerageBindMode: number
+  brokeragePostUrls: string
+  brokerageFirstPercent: number
+  brokerageSecondPercent: number
+  brokerageWithdrawMinPrice: number
+  brokerageBankNames: string
+  brokerageFrozenDays: number
+  brokerageWithdrawType: string
+}
+
+// 查询交易中心配置详情
+export const getTradeConfig = async () => {
+  return await request.get({ url: `/trade/config/get` })
+}
+
+// 保存交易中心配置
+export const saveTradeConfig = async (data: ConfigVO) => {
+  return await request.put({ url: `/trade/config/save`, data })
+}
diff --git a/src/api/member/point/config/index.ts b/src/api/member/point/config/index.ts
index 9fbd0447..9a3c4c48 100644
--- a/src/api/member/point/config/index.ts
+++ b/src/api/member/point/config/index.ts
@@ -6,16 +6,6 @@ export interface ConfigVO {
   tradeDeductUnitPrice: number
   tradeDeductMaxPrice: number
   tradeGivePoint: number
-  brokerageEnabled: boolean
-  brokerageEnabledCondition: number
-  brokerageBindMode: number
-  brokeragePostUrls: string[]
-  brokerageFirstPercent: number
-  brokerageSecondPercent: number
-  brokerageWithdrawMinPrice: number
-  brokerageBankNames: number[]
-  brokerageFrozenDays: number
-  brokerageWithdrawType: number[]
 }
 
 // 查询积分设置详情
diff --git a/src/views/mall/trade/config/index.vue b/src/views/mall/trade/config/index.vue
new file mode 100644
index 00000000..7ffe4091
--- /dev/null
+++ b/src/views/mall/trade/config/index.vue
@@ -0,0 +1,209 @@
+<template>
+  <ContentWrap>
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="hideId" v-show="false">
+        <el-input v-model="formData.id" />
+      </el-form-item>
+
+      <el-tabs>
+        <el-tab-pane label="分销">
+          <el-form-item label="分佣启用" prop="brokerageEnabled">
+            <el-switch v-model="formData.brokerageEnabled" style="user-select: none" />
+            <el-text class="w-full" size="small" type="info"> 商城是否开启分销模式 </el-text>
+          </el-form-item>
+          <el-form-item label="分佣模式" prop="brokerageEnabledCondition">
+            <el-radio-group v-model="formData.brokerageEnabledCondition">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_ENABLED_CONDITION)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+            <el-text class="w-full" size="small" type="info">
+              人人分销：每个用户都可以成为推广员
+            </el-text>
+            <el-text class="w-full" size="small" type="info">
+              指定分销：仅可在后台手动设置推广员
+            </el-text>
+          </el-form-item>
+          <el-form-item label="分销关系绑定" prop="brokerageBindMode">
+            <el-radio-group v-model="formData.brokerageBindMode">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+            <el-text class="w-full" size="small" type="info">
+              没有推广人：只要用户没有推广人，随时都可以绑定推广关系
+            </el-text>
+            <el-text class="w-full" size="small" type="info">
+              新用户：只有新用户注册时或首次进入系统时才可以绑定推广关系
+            </el-text>
+          </el-form-item>
+          <el-form-item label="分销海报图">
+            <UploadImgs v-model="formData.brokeragePostUrls" width="75px" height="125px" />
+            <el-text class="w-full" size="small" type="info">
+              个人中心分销海报图片，建议尺寸600x1000
+            </el-text>
+          </el-form-item>
+          <el-form-item label="一级返佣比例" prop="brokerageFirstPercent">
+            <el-input-number
+              v-model="formData.brokerageFirstPercent"
+              placeholder="请输入一级返佣比例"
+            />
+            <el-text class="w-full" size="small" type="info">
+              订单交易成功后给推广人返佣的百分比
+            </el-text>
+          </el-form-item>
+          <el-form-item label="二级返佣比例" prop="brokerageSecondPercent">
+            <el-input-number
+              v-model="formData.brokerageSecondPercent"
+              placeholder="请输入二级返佣比例"
+            />
+            <el-text class="w-full" size="small" type="info">
+              订单交易成功后给推广人的推荐人返佣的百分比
+            </el-text>
+          </el-form-item>
+          <el-form-item label="佣金冻结天数" prop="brokerageFrozenDays">
+            <el-input-number
+              v-model="formData.brokerageFrozenDays"
+              placeholder="请输入佣金冻结天数"
+            />
+            <el-text class="w-full" size="small" type="info">
+              防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天
+            </el-text>
+          </el-form-item>
+          <el-form-item label="提现最低金额" prop="brokerageWithdrawMinPrice">
+            <el-input-number
+              v-model="formData.brokerageWithdrawMinPrice"
+              placeholder="请输入用户提现最低金额"
+            />
+            <el-text class="w-full" size="small" type="info">
+              用户提现最低金额限制，单位：元
+            </el-text>
+          </el-form-item>
+          <el-form-item label="提现方式" prop="brokerageWithdrawType">
+            <el-checkbox-group v-model="formData.brokerageWithdrawType">
+              <el-checkbox
+                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-checkbox>
+            </el-checkbox-group>
+            <el-text class="w-full" size="small" type="info"> 商城开通提现的付款方式 </el-text>
+          </el-form-item>
+          <el-form-item label="提现银行" prop="brokerageBankNames">
+            <el-select v-model="formData.brokerageBankNames" placeholder="请选择提现银行" multiple>
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_BANK_NAME)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            <el-text class="w-full" size="small" type="info"> 商城开通提现的银行列表 </el-text>
+          </el-form-item>
+        </el-tab-pane>
+      </el-tabs>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm" :loading="formLoading"> 保存 </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import * as ConfigApi from '@/api/mall/trade/config'
+import { BrokerageBindModeEnum, BrokerageEnabledConditionEnum } from '@/utils/constants'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'TradeConfig' })
+
+const message = useMessage() // 消息弹窗
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formRef = ref()
+const formData = ref({
+  brokerageEnabled: true,
+  brokerageEnabledCondition: BrokerageEnabledConditionEnum.ALL.condition,
+  brokerageBindMode: BrokerageBindModeEnum.ANYTIME.mode,
+  brokeragePostUrls: [],
+  brokerageFirstPercent: 0,
+  brokerageSecondPercent: 0,
+  brokerageWithdrawMinPrice: 0,
+  brokerageBankNames: [],
+  brokerageFrozenDays: 0,
+  brokerageWithdrawType: []
+})
+const formRules = reactive({
+  brokerageEnabledCondition: [{ required: true, message: '分佣模式不能为空', trigger: 'blur' }],
+  brokerageBindMode: [{ required: true, message: '分销关系绑定模式不能为空', trigger: 'blur' }],
+  brokerageFirstPercent: [{ required: true, message: '一级返佣比例不能为空', trigger: 'blur' }],
+  brokerageSecondPercent: [{ required: true, message: '二级返佣比例不能为空', trigger: 'blur' }],
+  brokerageWithdrawMinPrice: [
+    { required: true, message: '用户提现最低金额不能为空', trigger: 'blur' }
+  ],
+  brokerageBankNames: [{ required: true, message: '提现银行不能为空', trigger: 'blur' }],
+  brokerageFrozenDays: [{ required: true, message: '佣金冻结时间不能为空', trigger: 'blur' }],
+  brokerageWithdrawType: [
+    {
+      required: true,
+      message: '提现方式不能为空',
+      trigger: 'change'
+    }
+  ]
+})
+
+const submitForm = async () => {
+  if (formLoading.value) return
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ConfigApi.ConfigVO
+    data.brokeragePostUrls = formData.value.brokeragePostUrls.map((item: any) => {
+      return item?.url ? item.url : item
+    })
+    await ConfigApi.saveTradeConfig(data)
+    message.success('保存成功')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 查询交易中心配置 */
+const getConfig = async () => {
+  formLoading.value = true
+  try {
+    const data = await ConfigApi.getTradeConfig()
+    if (data != null) {
+      data.brokeragePostUrls = data.brokeragePostUrls.map((url) => ({ url }))
+      formData.value = data
+    }
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getConfig()
+})
+</script>
diff --git a/src/views/member/point/config/index.vue b/src/views/member/point/config/index.vue
index bd0fe733..ed000537 100644
--- a/src/views/member/point/config/index.vue
+++ b/src/views/member/point/config/index.vue
@@ -13,7 +13,7 @@
 
       <el-tabs>
         <el-tab-pane label="积分">
-          <el-form-item label="积分抵扣" prop="tradeDeductEnable" class="item-bottom">
+          <el-form-item label="积分抵扣" prop="tradeDeductEnable">
             <el-switch v-model="formData.tradeDeductEnable" style="user-select: none" />
             <el-text class="w-full" size="small" type="info">下单积分是否抵用订单金额</el-text>
           </el-form-item>
@@ -46,111 +46,6 @@
             </el-text>
           </el-form-item>
         </el-tab-pane>
-        <el-tab-pane label="分销">
-          <el-form-item label="分佣启用" prop="brokerageEnabled">
-            <el-switch v-model="formData.brokerageEnabled" style="user-select: none" />
-            <el-text class="w-full" size="small" type="info"> 商城是否开启分销模式 </el-text>
-          </el-form-item>
-          <el-form-item label="分佣模式" prop="brokerageEnabledCondition">
-            <el-radio-group v-model="formData.brokerageEnabledCondition">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_ENABLED_CONDITION)"
-                :key="dict.value"
-                :label="dict.value"
-              >
-                {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-            <el-text class="w-full" size="small" type="info">
-              人人分销：每个用户都可以成为推广员
-            </el-text>
-            <el-text class="w-full" size="small" type="info">
-              指定分销：仅可在后台手动设置推广员
-            </el-text>
-          </el-form-item>
-          <el-form-item label="分销关系绑定" prop="brokerageBindMode">
-            <el-radio-group v-model="formData.brokerageBindMode">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE)"
-                :key="dict.value"
-                :label="dict.value"
-              >
-                {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-            <el-text class="w-full" size="small" type="info">
-              没有推广人：只要用户没有推广人，随时都可以绑定推广关系
-            </el-text>
-            <el-text class="w-full" size="small" type="info">
-              新用户：只有新用户注册时或首次进入系统时才可以绑定推广关系
-            </el-text>
-          </el-form-item>
-          <el-form-item label="分销海报图">
-            <UploadImgs v-model="formData.brokeragePostUrls" width="75px" height="125px" />
-            <el-text class="w-full" size="small" type="info">
-              个人中心分销海报图片，建议尺寸600x1000
-            </el-text>
-          </el-form-item>
-          <el-form-item label="一级返佣比例" prop="brokerageFirstPercent">
-            <el-input-number
-              v-model="formData.brokerageFirstPercent"
-              placeholder="请输入一级返佣比例"
-            />
-            <el-text class="w-full" size="small" type="info">
-              订单交易成功后给推广人返佣的百分比
-            </el-text>
-          </el-form-item>
-          <el-form-item label="二级返佣比例" prop="brokerageSecondPercent">
-            <el-input-number
-              v-model="formData.brokerageSecondPercent"
-              placeholder="请输入二级返佣比例"
-            />
-            <el-text class="w-full" size="small" type="info">
-              订单交易成功后给推广人的推荐人返佣的百分比
-            </el-text>
-          </el-form-item>
-          <el-form-item label="佣金冻结天数" prop="brokerageFrozenDays">
-            <el-input-number
-              v-model="formData.brokerageFrozenDays"
-              placeholder="请输入佣金冻结天数"
-            />
-            <el-text class="w-full" size="small" type="info">
-              防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天
-            </el-text>
-          </el-form-item>
-          <el-form-item label="提现最低金额" prop="brokerageWithdrawMinPrice">
-            <el-input-number
-              v-model="formData.brokerageWithdrawMinPrice"
-              placeholder="请输入用户提现最低金额"
-            />
-            <el-text class="w-full" size="small" type="info">
-              用户提现最低金额限制，单位：元
-            </el-text>
-          </el-form-item>
-          <el-form-item label="提现方式" prop="brokerageWithdrawType">
-            <el-checkbox-group v-model="formData.brokerageWithdrawType">
-              <el-checkbox
-                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
-                :key="dict.value"
-                :label="dict.value"
-              >
-                {{ dict.label }}
-              </el-checkbox>
-            </el-checkbox-group>
-            <el-text class="w-full" size="small" type="info"> 商城开通提现的付款方式 </el-text>
-          </el-form-item>
-          <el-form-item label="提现银行" prop="brokerageBankNames">
-            <el-select v-model="formData.brokerageBankNames" placeholder="请选择提现银行" multiple>
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_BANK_NAME)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-            <el-text class="w-full" size="small" type="info"> 商城开通提现的银行列表 </el-text>
-          </el-form-item>
-        </el-tab-pane>
       </el-tabs>
 
       <el-form-item>
@@ -161,8 +56,6 @@
 </template>
 <script lang="ts" setup>
 import * as ConfigApi from '@/api/member/point/config'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { BrokerageBindModeEnum, BrokerageEnabledConditionEnum } from '@/utils/constants'
 
 defineOptions({ name: 'MemberPointConfig' })
 
@@ -176,17 +69,7 @@ const formData = ref({
   tradeDeductEnable: true,
   tradeDeductUnitPrice: 0,
   tradeDeductMaxPrice: 0,
-  tradeGivePoint: 0,
-  brokerageEnabled: true,
-  brokerageEnabledCondition: BrokerageEnabledConditionEnum.ALL.condition,
-  brokerageBindMode: BrokerageBindModeEnum.ANYTIME.mode,
-  brokeragePostUrls: [],
-  brokerageFirstPercent: 0,
-  brokerageSecondPercent: 0,
-  brokerageWithdrawMinPrice: 0,
-  brokerageBankNames: [],
-  brokerageFrozenDays: 0,
-  brokerageWithdrawType: []
+  tradeGivePoint: 0
 })
 
 // 创建一个计算属性，用于将 tradeDeductUnitPrice 显示为带两位小数的形式
@@ -210,9 +93,6 @@ const onSubmit = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as ConfigApi.ConfigVO
-    data.brokeragePostUrls = formData.value.brokeragePostUrls.map((item: any) => {
-      return item?.url ? item.url : item
-    })
     await ConfigApi.saveConfig(data)
     message.success(t('common.updateSuccess'))
     dialogVisible.value = false
@@ -228,7 +108,6 @@ const getConfig = async () => {
     if (data === null) {
       return
     }
-    data.brokeragePostUrls = data.brokeragePostUrls.map((url) => ({ url }))
     formData.value = data
   } finally {
   }
@@ -238,9 +117,3 @@ onMounted(() => {
   getConfig()
 })
 </script>
-
-<style scoped>
-.item-bottom {
-  margin-bottom: 0;
-}
-</style>

From 2ed5d12be8c01bf8ed280086ef5b870f82553966 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Wed, 6 Sep 2023 00:33:59 +0800
Subject: [PATCH 2/6] =?UTF-8?q?trade:=20=E5=88=86=E9=94=80=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E4=BB=8E=20member=20=E6=A8=A1=E5=9D=97=20=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=20trade=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/{member => mall/trade}/brokerage/record/index.ts    | 4 ++--
 src/views/{member => mall/trade}/brokerage/record/index.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/api/{member => mall/trade}/brokerage/record/index.ts (66%)
 rename src/views/{member => mall/trade}/brokerage/record/index.vue (95%)

diff --git a/src/api/member/brokerage/record/index.ts b/src/api/mall/trade/brokerage/record/index.ts
similarity index 66%
rename from src/api/member/brokerage/record/index.ts
rename to src/api/mall/trade/brokerage/record/index.ts
index 33b6ab18..88a9f886 100644
--- a/src/api/member/brokerage/record/index.ts
+++ b/src/api/mall/trade/brokerage/record/index.ts
@@ -1,11 +1,11 @@
 import request from '@/config/axios'
 
 // 查询佣金记录列表
-export const getMemberBrokerageRecordPage = async (params: any) => {
+export const getBrokerageRecordPage = async (params: any) => {
   return await request.get({ url: `/member/member-brokerage-record/page`, params })
 }
 
 // 查询佣金记录详情
-export const getMemberBrokerageRecord = async (id: number) => {
+export const getBrokerageRecord = async (id: number) => {
   return await request.get({ url: `/member/member-brokerage-record/get?id=` + id })
 }
diff --git a/src/views/member/brokerage/record/index.vue b/src/views/mall/trade/brokerage/record/index.vue
similarity index 95%
rename from src/views/member/brokerage/record/index.vue
rename to src/views/mall/trade/brokerage/record/index.vue
index f9c8400a..0e62a778 100644
--- a/src/views/member/brokerage/record/index.vue
+++ b/src/views/mall/trade/brokerage/record/index.vue
@@ -107,9 +107,9 @@
 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import * as MemberBrokerageRecordApi from '@/api/member/brokerage/record'
+import * as BrokerageRecordApi from '@/api/mall/trade/brokerage/record'
 
-defineOptions({ name: 'MemberBrokerageRecord' })
+defineOptions({ name: 'TradeBrokerageRecord' })
 
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
@@ -129,7 +129,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
-    const data = await MemberBrokerageRecordApi.getMemberBrokerageRecordPage(queryParams)
+    const data = await BrokerageRecordApi.getBrokerageRecordPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {

From 1e2120806d26f0749b89329b0dd94f0fa5d15edc Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Wed, 6 Sep 2023 00:41:20 +0800
Subject: [PATCH 3/6] =?UTF-8?q?trade:=20=E5=88=86=E9=94=80=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E4=BB=8E=20member=20=E6=A8=A1=E5=9D=97=20=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=20trade=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/trade/brokerage/record/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/mall/trade/brokerage/record/index.ts b/src/api/mall/trade/brokerage/record/index.ts
index 88a9f886..7df9a225 100644
--- a/src/api/mall/trade/brokerage/record/index.ts
+++ b/src/api/mall/trade/brokerage/record/index.ts
@@ -2,10 +2,10 @@ import request from '@/config/axios'
 
 // 查询佣金记录列表
 export const getBrokerageRecordPage = async (params: any) => {
-  return await request.get({ url: `/member/member-brokerage-record/page`, params })
+  return await request.get({ url: `/trade/brokerage-record/page`, params })
 }
 
 // 查询佣金记录详情
 export const getBrokerageRecord = async (id: number) => {
-  return await request.get({ url: `/member/member-brokerage-record/get?id=` + id })
+  return await request.get({ url: `/trade/brokerage-record/get?id=` + id })
 }

From 34ce7f7ec512eaa42bf86b04ddf2e67c082ecdde Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 8 Sep 2023 10:59:06 +0800
Subject: [PATCH 4/6] =?UTF-8?q?trade:=20=E5=88=86=E9=94=80=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/trade/brokerage/user/index.ts    |  21 ++
 src/views/mall/trade/brokerage/user/index.vue | 248 ++++++++++++++++++
 2 files changed, 269 insertions(+)
 create mode 100644 src/api/mall/trade/brokerage/user/index.ts
 create mode 100644 src/views/mall/trade/brokerage/user/index.vue

diff --git a/src/api/mall/trade/brokerage/user/index.ts b/src/api/mall/trade/brokerage/user/index.ts
new file mode 100644
index 00000000..ec46e9a8
--- /dev/null
+++ b/src/api/mall/trade/brokerage/user/index.ts
@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+export interface BrokerageUserVO {
+  id: number
+  brokerageUserId: number
+  brokerageBindTime: Date
+  brokerageEnabled: boolean
+  brokerageTime: Date
+  brokeragePrice: number
+  frozenBrokeragePrice: number
+}
+
+// 查询分销用户列表
+export const getBrokerageUserPage = async (params: any) => {
+  return await request.get({ url: `/trade/brokerage-user/page`, params })
+}
+
+// 查询分销用户详情
+export const getBrokerageUser = async (id: number) => {
+  return await request.get({ url: `/trade/brokerage-user/get?id=` + id })
+}
diff --git a/src/views/mall/trade/brokerage/user/index.vue b/src/views/mall/trade/brokerage/user/index.vue
new file mode 100644
index 00000000..70a97676
--- /dev/null
+++ b/src/views/mall/trade/brokerage/user/index.vue
@@ -0,0 +1,248 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="85px"
+    >
+      <el-form-item label="推广员编号" prop="brokerageUserId">
+        <el-input
+          v-model="queryParams.brokerageUserId"
+          placeholder="请输入推广员编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="推广资格" prop="brokerageEnabled">
+        <el-select
+          v-model="queryParams.brokerageEnabled"
+          class="!w-240px"
+          clearable
+          placeholder="请选择推广资格"
+        >
+          <el-option label="有" :value="true" />
+          <el-option label="无" :value="false" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="用户编号" align="center" prop="id" min-width="80px" />
+      <el-table-column label="头像" align="center" prop="avatar" width="70px">
+        <template #default="scope">
+          <el-avatar :src="scope.row.avatar" />
+        </template>
+      </el-table-column>
+      <el-table-column label="昵称" align="center" prop="nickname" min-width="80px" />
+      <el-table-column
+        label="推广用户数量（一级）"
+        align="center"
+        prop="brokerageUserCount"
+        min-width="110px"
+      />
+      <el-table-column
+        label="推广订单数量"
+        align="center"
+        prop="brokerageOrderCount"
+        min-width="110px"
+      />
+      <el-table-column
+        label="推广订单金额"
+        align="center"
+        prop="brokerageOrderPrice"
+        min-width="110px"
+      />
+      <el-table-column label="已提现金额" align="center" prop="withdrawPrice" min-width="100px" />
+      <el-table-column label="已提现次数" align="center" prop="withdrawCount" min-width="100px" />
+      <el-table-column label="未提现金额" align="center" prop="brokeragePrice" min-width="100px" />
+      <el-table-column
+        label="冻结中佣金"
+        align="center"
+        prop="frozenBrokeragePrice"
+        min-width="100px"
+      />
+      <el-table-column label="推广资格" align="center" prop="brokerageEnabled" min-width="80px">
+        <template #default="scope">
+          <el-switch
+            v-model="scope.row.brokerageEnabled"
+            active-text="有"
+            inactive-text="无"
+            inline-prompt
+            :disabled="!checkPermi(['trade:brokerage-user:update-brokerage-user'])"
+            @change="handleBrokerageEnabledChange(scope.row.id, !scope.row.brokerageEnabled)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="成为推广员时间"
+        align="center"
+        prop="brokerageTime"
+        :formatter="dateFormatter"
+        width="170px"
+      />
+      <el-table-column label="上级推广员编号" align="center" prop="brokerageUserId" width="150px" />
+      <el-table-column
+        label="推广员绑定时间"
+        align="center"
+        prop="brokerageBindTime"
+        :formatter="dateFormatter"
+        width="170px"
+      />
+      <el-table-column label="操作" align="center" width="150px" fixed="right">
+        <template #default="scope">
+          <el-dropdown
+            @command="(command) => handleCommand(command, scope.row)"
+            v-hasPermi="[
+              'trade:brokerage-user:user-query',
+              'trade:brokerage-user:order-query',
+              'trade:brokerage-user:update-brokerage-user',
+              'trade:brokerage-user:clear-brokerage-user'
+            ]"
+          >
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item
+                  command="openBrokerageUserTable"
+                  v-if="checkPermi(['trade:brokerage-user:user-query'])"
+                >
+                  推广人
+                </el-dropdown-item>
+                <el-dropdown-item
+                  command="openBrokerageOrderTable"
+                  v-if="checkPermi(['trade:brokerage-user:order-query'])"
+                >
+                  推广订单
+                </el-dropdown-item>
+                <el-dropdown-item
+                  command="openUpdateBindUser"
+                  v-if="checkPermi(['trade:brokerage-user:update-brokerage-user'])"
+                >
+                  修改上级推广人
+                </el-dropdown-item>
+                <el-dropdown-item
+                  command="openClearBindUser"
+                  v-if="checkPermi(['trade:brokerage-user:clear-brokerage-user'])"
+                >
+                  清除上级推广人
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
+import { checkPermi } from '@/utils/permission'
+
+defineOptions({ name: 'TradeBrokerageUser' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  brokerageUserId: null,
+  brokerageEnabled: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BrokerageUserApi.getBrokerageUserPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const handleCommand = (command: string, row: BrokerageUserApi.BrokerageUserVO) => {
+  switch (command) {
+    case 'openBrokerageUserTable':
+      openBrokerageUserTable(row.id)
+      break
+    case 'openBrokerageOrderTable':
+      openBrokerageOrderTable(row.id)
+      break
+    case 'openUpdateBindUser':
+      openUpdateBindUser(row.id)
+      break
+    case 'openClearBindUser':
+      openClearBindUser(row.id)
+      break
+  }
+}
+
+/** 打开推广人列表 */
+const openBrokerageUserTable = (id: number) => {}
+
+/** 打开推广订单列表 */
+const openBrokerageOrderTable = (id: number) => {}
+
+/** 打开表单：修改上级推广人 */
+const openUpdateBindUser = (id: number) => {}
+
+/** 打开表单：清除上级推广人 */
+const openClearBindUser = (id: number) => {}
+
+/** 推广资格 开通/关闭 */
+const handleBrokerageEnabledChange = (id: number, enabled: boolean) => {}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From 726331541222c7822695b88f709a7db8f1df9d10 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 8 Sep 2023 22:51:04 +0800
Subject: [PATCH 5/6] =?UTF-8?q?trade:=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81=E7=BB=91=E5=AE=9A=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/trade/brokerage/user/index.ts    |  4 ++--
 src/views/mall/trade/brokerage/user/index.vue | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/api/mall/trade/brokerage/user/index.ts b/src/api/mall/trade/brokerage/user/index.ts
index ec46e9a8..736cf6e7 100644
--- a/src/api/mall/trade/brokerage/user/index.ts
+++ b/src/api/mall/trade/brokerage/user/index.ts
@@ -2,8 +2,8 @@ import request from '@/config/axios'
 
 export interface BrokerageUserVO {
   id: number
-  brokerageUserId: number
-  brokerageBindTime: Date
+  bindUserId: number
+  bindUserTime: Date
   brokerageEnabled: boolean
   brokerageTime: Date
   brokeragePrice: number
diff --git a/src/views/mall/trade/brokerage/user/index.vue b/src/views/mall/trade/brokerage/user/index.vue
index 70a97676..37e17a3d 100644
--- a/src/views/mall/trade/brokerage/user/index.vue
+++ b/src/views/mall/trade/brokerage/user/index.vue
@@ -8,9 +8,9 @@
       :inline="true"
       label-width="85px"
     >
-      <el-form-item label="推广员编号" prop="brokerageUserId">
+      <el-form-item label="推广员编号" prop="bindUserId">
         <el-input
-          v-model="queryParams.brokerageUserId"
+          v-model="queryParams.bindUserId"
           placeholder="请输入推广员编号"
           clearable
           @keyup.enter="handleQuery"
@@ -102,11 +102,11 @@
         :formatter="dateFormatter"
         width="170px"
       />
-      <el-table-column label="上级推广员编号" align="center" prop="brokerageUserId" width="150px" />
+      <el-table-column label="上级推广员编号" align="center" prop="bindUserId" width="150px" />
       <el-table-column
         label="推广员绑定时间"
         align="center"
-        prop="brokerageBindTime"
+        prop="bindUserTime"
         :formatter="dateFormatter"
         width="170px"
       />
@@ -179,7 +179,7 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  brokerageUserId: null,
+  bindUserId: null,
   brokerageEnabled: null,
   createTime: []
 })

From e9d5027e72d86c308b766d08936e15d4217301c1 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 8 Sep 2023 23:10:04 +0800
Subject: [PATCH 6/6] =?UTF-8?q?trade:=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E7=94=A8=E6=88=B7=E4=BD=A3=E9=87=91=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/trade/brokerage/user/index.ts    | 4 ++--
 src/views/mall/trade/brokerage/user/index.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/mall/trade/brokerage/user/index.ts b/src/api/mall/trade/brokerage/user/index.ts
index 736cf6e7..95f3a6a1 100644
--- a/src/api/mall/trade/brokerage/user/index.ts
+++ b/src/api/mall/trade/brokerage/user/index.ts
@@ -6,8 +6,8 @@ export interface BrokerageUserVO {
   bindUserTime: Date
   brokerageEnabled: boolean
   brokerageTime: Date
-  brokeragePrice: number
-  frozenBrokeragePrice: number
+  price: number
+  frozenPrice: number
 }
 
 // 查询分销用户列表
diff --git a/src/views/mall/trade/brokerage/user/index.vue b/src/views/mall/trade/brokerage/user/index.vue
index 37e17a3d..f2459e64 100644
--- a/src/views/mall/trade/brokerage/user/index.vue
+++ b/src/views/mall/trade/brokerage/user/index.vue
@@ -76,11 +76,11 @@
       />
       <el-table-column label="已提现金额" align="center" prop="withdrawPrice" min-width="100px" />
       <el-table-column label="已提现次数" align="center" prop="withdrawCount" min-width="100px" />
-      <el-table-column label="未提现金额" align="center" prop="brokeragePrice" min-width="100px" />
+      <el-table-column label="未提现金额" align="center" prop="price" min-width="100px" />
       <el-table-column
         label="冻结中佣金"
         align="center"
-        prop="frozenBrokeragePrice"
+        prop="frozenPrice"
         min-width="100px"
       />
       <el-table-column label="推广资格" align="center" prop="brokerageEnabled" min-width="80px">