From 57a61277fd2edd94a6dab2158554d5a230402864 Mon Sep 17 00:00:00 2001
From: khy <2908249413@qq.com>
Date: Thu, 8 May 2025 11:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=8D=E8=8D=89=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=94=B3=E8=AF=B7=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/trade/brokerage/withdraw/index.ts    |  32 +++
 .../brokerage/withdraw/ClosingRecordForm.vue  | 232 ++++++++++++++++++
 .../mall/trade/brokerage/withdraw/index.vue   |  14 ++
 .../src/views/member/config/index.vue         |  23 +-
 .../admin/circle/vo/CirclePageReqVO.java      |   5 +-
 .../admin/circle/vo/CircleRespVO.java         |   5 +-
 .../admin/circle/vo/CircleSaveReqVO.java      |   5 +-
 .../app/circle/AppCircleController.java       |  31 ++-
 .../dal/dataobject/circle/CircleDO.java       |   7 +-
 .../BrokerageWithdrawController.java          | 145 ++++++++++-
 .../withdraw/BrokerageSupplyInfoRespVO.java   |  61 +++++
 .../vo/withdraw/BrokerageWithdrawBaseVO.java  |   4 +-
 .../brokerage/BrokerageWithdrawConvert.java   |   8 +-
 .../brokerage/BrokerageWithdrawDO.java        |  10 +
 .../brokerage/BrokerageUserServiceImpl.java   |   5 +-
 .../brokerage/BrokerageWithdrawService.java   |   5 +
 .../BrokerageWithdrawServiceImpl.java         |  38 ++-
 .../admin/config/vo/MemberConfigBaseVO.java   |  12 +
 .../dal/dataobject/config/MemberConfigDO.java |  13 +
 19 files changed, 637 insertions(+), 18 deletions(-)
 create mode 100644 yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/ClosingRecordForm.vue
 create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageSupplyInfoRespVO.java

diff --git a/yudao-admin-vue3/src/api/mall/trade/brokerage/withdraw/index.ts b/yudao-admin-vue3/src/api/mall/trade/brokerage/withdraw/index.ts
index c93286a..33eab48 100644
--- a/yudao-admin-vue3/src/api/mall/trade/brokerage/withdraw/index.ts
+++ b/yudao-admin-vue3/src/api/mall/trade/brokerage/withdraw/index.ts
@@ -18,6 +18,28 @@ export interface BrokerageWithdrawVO {
   remark: string
 }
 
+export interface withDrawSupplyVO {
+  id: number,
+  userId: number,
+  agentPrice: number,
+  brokeragePrice: number,
+  frozenPrice: number,
+  closingType: number,
+  wechatAccountQrCodeUrl: string,
+  aliyAccountQrCodeUrl: string,
+  realName: string,
+  accountNo: string,
+  bankName: string,
+  bankCardNo: string,
+  supplyPrice: number,
+  remark: string,
+  wechatAccount: string,
+  aliyAccount: string,
+  agentId: number,
+  agentName: string,
+}
+
+
 // 查询佣金提现列表
 export const getBrokerageWithdrawPage = async (params: any) => {
   return await request.get({ url: `/trade/brokerage-withdraw/page`, params })
@@ -37,3 +59,13 @@ export const approveBrokerageWithdraw = async (id: number) => {
 export const rejectBrokerageWithdraw = async (data: BrokerageWithdrawVO) => {
   return await request.put({ url: `/trade/brokerage-withdraw/reject`, data })
 }
+
+// 结算申请
+export const createWithDraw = async (data: withDrawSupplyVO) => {
+  return await request.post({ url: `/trade/brokerage-withdraw/create-supply`,data })
+}
+
+// 导出佣金提现 Excel
+export const exportBrokerageWithDraw = async (params) => {
+  return await request.download({ url: `/trade/brokerage-withdraw/export-excel`, params })
+}
diff --git a/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/ClosingRecordForm.vue b/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/ClosingRecordForm.vue
new file mode 100644
index 0000000..dc2a868
--- /dev/null
+++ b/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/ClosingRecordForm.vue
@@ -0,0 +1,232 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+<!--      <el-form-item label="提现用户:" prop="userId">-->
+<!--        <el-select v-model="formData.userId" placeholder="请选择提现用户" @change="handleUserSelect(formData.userId)">-->
+<!--          <el-option v-for="item in supplyUserList"-->
+<!--                     :key="item.id"-->
+<!--                     :label="item.name"-->
+<!--                     :value="item.id" >-->
+<!--            <template #default>-->
+<!--              <div class="user-option">-->
+<!--                <img-->
+<!--                  :src="item.avatar"-->
+<!--                  class="user-avatar"-->
+<!--                />-->
+<!--                <span class="user-name">{{ item.name }}</span>-->
+<!--              </div>-->
+<!--            </template>-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="代理商余额:" prop="agentPrice">
+        <span>￥ {{fenToYuan(formData.agentPrice) || '-'}} </span>
+<!--        <el-input v-model="formData.agentPrice" placeholder="请输入代理商id" :disabled="true"/>-->
+      </el-form-item>
+      <el-form-item label="可提现金额:" prop="brokeragePrice">
+        <span>￥ {{fenToYuan(formData.brokeragePrice) || '-'}} </span>
+<!--        <el-input v-model="formData.brokeragePrice" placeholder="请输入可提现金额" :disabled= "true"/>-->
+      </el-form-item>
+      <el-form-item label="冻结金额:" prop="frozenPrice">
+        <span>￥ {{fenToYuan(formData.frozenPrice) || '-'}} </span>
+<!--        <el-input v-model="formData.frozenPrice" placeholder="请输入冻结金额" :disabled= "true"/>-->
+      </el-form-item>
+      <el-form-item label="结算类型:" prop="closingType">
+        <el-radio-group v-model="formData.closingType">
+          <el-radio :value="1">钱包</el-radio>
+          <el-radio :value="2">银行</el-radio>
+          <el-radio :value="3">微信</el-radio>
+          <el-radio :value="4">支付宝</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="真实姓名:" prop="realName">
+        <span>{{(formData.realName) || '-'}} </span>
+      </el-form-item>
+      <el-form-item v-if="formData.closingType === 3" label="微信账号:" prop="wechatAccount">
+        <span>{{(formData.wechatAccount) || '-'}} </span>
+      </el-form-item>
+      <el-form-item v-if="formData.closingType === 3" label="微信收款码:" prop="wechatAccountQrCodeUrl">
+        <UploadImg v-model="formData.wechatAccountQrCodeUrl" :disabled="true"/>
+      </el-form-item>
+      <el-form-item v-if="formData.closingType === 4" label="支付宝账号:" prop="alipayAccount">
+        <span>{{(formData.alipayAccount || '-')}} </span>
+      </el-form-item>
+      <el-form-item v-if="formData.closingType === 4" label="支付宝收款码:" prop="alipayAccountQrCodeUrl">
+        <UploadImg v-model="formData.alipayAccountQrCodeUrl" :disabled="true"/>
+      </el-form-item>
+      <el-form-item v-if="formData.closingType === 2" label="开户银行:" prop="bankName">
+        <span>{{(formData.bankName) || '-'}} </span>
+      </el-form-item>
+      <el-form-item v-if="formData.closingType === 2" label="银行账号:" prop="bankCardNo">
+        <span>{{(formData.bankCardNo) || '-'}} </span>
+      </el-form-item>
+      <el-form-item label="申请金额:" prop="supplyPrice">
+        <el-input-number v-model="formData.supplyPrice" :min="1" :precision="2" :step="0.01"/>
+      </el-form-item>
+      <el-form-item label="备注:" prop="remark">
+        <el-input type="textarea" v-model="formData.remark" 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'
+import { fenToYuan, jsonParse } from '@/utils'
+import {getBrokerageUser} from '@/api/mall/trade/brokerage/user'
+
+/** 结算记录 表单 */
+defineOptions({ name: 'ClosingRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  userId: undefined,
+  agentPrice: undefined,
+  brokeragePrice: undefined,
+  frozenPrice: undefined,
+  closingType: undefined,
+  wechatAccountQrCodeUrl: undefined,
+  aliyAccountQrCodeUrl: undefined,
+  realName: undefined,
+  accountNo: undefined,
+  bankName: undefined,
+  bankCardNo: undefined,
+  supplyPrice: undefined,
+  remark: undefined,
+  wechatAccount: undefined,
+  aliyAccount: undefined,
+  agentId: undefined,
+  agentName: undefined,
+})
+const formRules = reactive({
+  closingType: [{ required: true, message: '结算类型不能为空', trigger: 'change' }],
+  supplyPrice: [{ required: true, message: '申请金额不能为空', trigger: 'change' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // formData.value = await BrokerageWithdrawApi.getBrokerageSupplyInfo()
+  formData.value.closingType = 1
+  formData.value.supplyPrice = 1
+  console.log("form:",formData.value)
+  /*// 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+
+
+    } finally {
+      formLoading.value = false
+    }
+  }*/
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+const supplyUserList = ref([]);
+
+const handleUserSelect = async (userId) => {
+  const res = await getBrokerageUser(userId)
+  console.log('res11:', res)
+  // formData.value.
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BrokerageWithdrawApi.withDrawSupplyVO
+    if (formType.value === 'create') {
+      const submitData = JSON.parse(JSON.stringify(data))
+      submitData.supplyPrice = submitData.supplyPrice * 100
+      console.log("formData:",data)
+
+      await BrokerageWithdrawApi.createWithDraw(submitData)
+      message.success(t('common.createSuccess'))
+    }
+   /* else {
+      await ClosingRecordApi.updateClosingRecord(data)
+      message.success(t('common.updateSuccess'))
+    }*/
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    userId: undefined,
+    agentPrice: undefined,
+    brokeragePrice: undefined,
+    frozenPrice: undefined,
+    closingType: undefined,
+    wechatAccountQrCodeUrl: undefined,
+    aliyAccountQrCodeUrl: undefined,
+    realName: undefined,
+    accountNo: undefined,
+    bankName: undefined,
+    bankCardNo: undefined,
+    supplyPrice: undefined,
+    remark: undefined,
+    wechatAccount: undefined,
+    aliyAccount: undefined,
+    agentId: undefined,
+    agentName: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
+<style scoped>
+::v-deep .el-select-dropdown__item {
+  height: auto !important;
+  padding: 0 !important;
+}
+
+.user-option {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+}
+
+.user-avatar {
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  margin-right: 10px;
+  object-fit: cover;
+}
+
+.user-name {
+  font-size: 14px;
+  color: #606266;
+}
+</style>
diff --git a/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/index.vue b/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/index.vue
index 762451f..ac0b11e 100644
--- a/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/index.vue
+++ b/yudao-admin-vue3/src/views/mall/trade/brokerage/withdraw/index.vue
@@ -82,6 +82,12 @@
       <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-button
+          @click="openClosingForm('create')"
+          v-hasPermi="['trade:brokerage-withdraw:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 申请结算
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -184,6 +190,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <BrokerageWithdrawRejectForm ref="formRef" @success="getList" />
+  <ClosingRecordForm ref="closingFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -191,6 +198,7 @@ import { DICT_TYPE, getDictLabel, getIntDictOptions, getStrDictOptions } from '@
 import { dateFormatter, formatDate } from '@/utils/formatTime'
 import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
 import BrokerageWithdrawRejectForm from './BrokerageWithdrawRejectForm.vue'
+import ClosingRecordForm from "@/views/mall/trade/brokerage/withdraw/ClosingRecordForm.vue";
 import { BrokerageWithdrawStatusEnum, BrokerageWithdrawTypeEnum } from '@/utils/constants'
 import { fenToYuanFormat } from '@/utils/formatter'
 import { fenToYuan } from '@/utils'
@@ -248,6 +256,12 @@ const openForm = (id: number) => {
   formRef.value.open(id)
 }
 
+/** 添加/修改操作 */
+const closingFormRef = ref()
+const openClosingForm = (type: string,id?: number) => {
+  closingFormRef.value.open(type,id)
+}
+
 /** 审核通过 */
 const handleApprove = async (id: number) => {
   try {
diff --git a/yudao-admin-vue3/src/views/member/config/index.vue b/yudao-admin-vue3/src/views/member/config/index.vue
index 90afdbb..51fb2c0 100644
--- a/yudao-admin-vue3/src/views/member/config/index.vue
+++ b/yudao-admin-vue3/src/views/member/config/index.vue
@@ -47,6 +47,24 @@
               下单支付金额按比例赠送积分（实际支付 1 元赠送多少积分）
             </el-text>
           </el-form-item>
+          <el-form-item label="分享赠送多少分" prop="pointTradeSharePoint">
+            <el-input-number
+              v-model="formData.pointTradeSharePoint"
+              placeholder="请输入 分享赠送多少积分"
+            />
+          </el-form-item>
+          <el-form-item label="好评赠送多少分" prop="pointTradeGoodcommentPoint">
+            <el-input-number
+              v-model="formData.pointTradeGoodcommentPoint"
+              placeholder="请输入 好评赠送多少积分"
+            />
+          </el-form-item>
+          <el-form-item label="推广赠送多少分" prop="pointTradePromotionPoint">
+            <el-input-number
+              v-model="formData.pointTradePromotionPoint"
+              placeholder="请输入 推广商品可赠送多少积分"
+            />
+          </el-form-item>
           <el-form-item label="积分协议">
             <Editor v-model="formData.content" />
           </el-form-item>
@@ -75,7 +93,10 @@ const formData = ref({
   pointTradeDeductUnitPrice: 0,
   pointTradeDeductMaxPrice: 0,
   pointTradeGivePoint: 0,
-  content: ''
+  content: '',
+  pointTradeSharePoint: 0,
+  pointTradeGoodcommentPoint: 0,
+  pointTradePromotionPoint: 0
 })
 
 // 创建一个计算属性，用于将 pointTradeDeductUnitPrice 显示为带两位小数的形式
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CirclePageReqVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CirclePageReqVO.java
index 79e4ca4..268db4c 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CirclePageReqVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CirclePageReqVO.java
@@ -18,6 +18,9 @@ public class CirclePageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "20140")
     private Long userId;
 
+    @Schema(description = "用户昵称", example = "用户000")
+    private String nickname;
+
     @Schema(description = "发表内容")
     private String content;
 
@@ -40,4 +43,4 @@ public class CirclePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleRespVO.java
index 85936ed..ad68050 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleRespVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleRespVO.java
@@ -22,6 +22,9 @@ public class CircleRespVO {
     @ExcelProperty("用户编号")
     private Long userId;
 
+    @Schema(description = "用户昵称", example = "用户000")
+    private String nickname;
+
     @Schema(description = "发表内容")
     @ExcelProperty("发表内容")
     private String content;
@@ -53,4 +56,4 @@ public class CircleRespVO {
     @Schema(description = "评论信息")
     private List<CircleReviewDO> circleList;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleSaveReqVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleSaveReqVO.java
index ab5539c..fa24070 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleSaveReqVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/circle/vo/CircleSaveReqVO.java
@@ -15,6 +15,9 @@ public class CircleSaveReqVO {
     @Schema(description = "用户编号", example = "20140")
     private Long userId;
 
+    @Schema(description = "用户昵称", example = "用户000")
+    private String nickname;
+
     @Schema(description = "发表内容")
     private String content;
 
@@ -33,4 +36,4 @@ public class CircleSaveReqVO {
     @Schema(description = "更新版本号")
     private Integer version;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/circle/AppCircleController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/circle/AppCircleController.java
index 1faf0a5..1cb7d76 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/circle/AppCircleController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/circle/AppCircleController.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.promotion.controller.admin.circle.vo.CirclePageReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.circle.vo.CircleRespVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.circle.vo.CircleSaveReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.circlereview.vo.CircleReviewSaveReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.circle.CircleDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.circlereview.CircleReviewDO;
@@ -62,7 +63,29 @@ public class AppCircleController {
         return success(result);
     }
 
-    @GetMapping("/doBrowse")
+    @PostMapping("/create")
+    @Operation(summary = "发表社区动态")
+    @PreAuthenticated
+    public CommonResult<Boolean> createCircle(@RequestBody CircleSaveReqVO createReqVO){
+        String nickname = memberUserApi.getUser(getLoginUserId()).getNickname();
+        createReqVO.setUserId(getLoginUserId());
+        createReqVO.setNickname(nickname);
+        circleService.createCircle(createReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/doCircleUpdate")
+    @Operation(summary = "编辑社区动态")
+    @PreAuthenticated
+    public CommonResult<Boolean> updateCircle(@RequestBody CircleSaveReqVO updateReqVO){
+        String nickname = memberUserApi.getUser(getLoginUserId()).getNickname();
+        updateReqVO.setUserId(getLoginUserId());
+        updateReqVO.setNickname(nickname);
+        circleService.updateCircle(updateReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/doBrowse")
     @Operation(summary = "浏览量叠加")
     @PreAuthenticated
     public CommonResult<Boolean> doBrowse(@RequestParam("id") Long lookId){
@@ -70,7 +93,7 @@ public class AppCircleController {
         return success(true);
     }
 
-    @GetMapping("/doLike")
+    @PutMapping("/doLike")
     @Operation(summary = "点赞/取消点赞")
     @PreAuthenticated
     public CommonResult<Boolean> doLike(@RequestParam("id") Long lookId){
@@ -87,7 +110,7 @@ public class AppCircleController {
         return success(true);
     }
 
-    @GetMapping("/doReviewDelete")
+    @DeleteMapping("/doReviewDelete")
     @Operation(summary = "删除评论")
     @PreAuthenticated
     public CommonResult<Boolean> doReviewDelete(@RequestParam("id") Long lookId){
@@ -95,7 +118,7 @@ public class AppCircleController {
         return success(true);
     }
 
-    @GetMapping("/doCircleDelete")
+    @DeleteMapping("/doCircleDelete")
     @Operation(summary = "删除动态")
     @PreAuthenticated
     public CommonResult<Boolean> doCircleDelete(@RequestParam("id") Long lookId){
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/circle/CircleDO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/circle/CircleDO.java
index db137cc..1c208e7 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/circle/CircleDO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/circle/CircleDO.java
@@ -22,6 +22,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @AllArgsConstructor
 public class CircleDO extends BaseDO {
 
+
     /**
      * 编号
      */
@@ -31,6 +32,10 @@ public class CircleDO extends BaseDO {
      * 用户编号
      */
     private Long userId;
+    /**
+     * 用户编号
+     */
+    private String nickname;
     /**
      * 发表内容
      */
@@ -56,4 +61,4 @@ public class CircleDO extends BaseDO {
      */
     private Integer version;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java
index 5df19cc..35d088c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java
@@ -1,16 +1,25 @@
 package cn.iocoder.yudao.module.trade.controller.admin.brokerage;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.agent.enums.api.agentinfo.AgentInfoApi;
+import cn.iocoder.yudao.module.agent.enums.api.agentinfo.dto.AgentInfoRespDTO;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.pay.api.notify.dto.PayTransferNotifyReqDTO;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageSupplyInfoRespVO;
 import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRejectReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO;
 import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageWithdrawConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -22,11 +31,18 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 佣金提现")
 @RestController
@@ -41,6 +57,12 @@ public class BrokerageWithdrawController {
     @Resource
     private MemberUserApi memberUserApi;
 
+    @Resource
+    private AgentInfoApi agentInfoApi;
+
+    @Resource
+    private BrokerageUserService brokerageUserService;
+
     @PutMapping("/approve")
     @Operation(summary = "通过申请")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:audit')")
@@ -73,10 +95,12 @@ public class BrokerageWithdrawController {
         // 分页查询
         PageResult<BrokerageWithdrawDO> pageResult = brokerageWithdrawService.getBrokerageWithdrawPage(pageVO);
 
+        Set<Long> userIds = convertSet(pageResult.getList(), BrokerageWithdrawDO::getUserId);
         // 拼接信息
         Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
                 convertSet(pageResult.getList(), BrokerageWithdrawDO::getUserId));
-        return success(BrokerageWithdrawConvert.INSTANCE.convertPage(pageResult, userMap));
+        Map<Long, BrokerageWithdrawRespVO> brokerageWithdrawMap =  brokerageWithdrawService.getBrokerageWithdrawMap(userIds);
+        return success(BrokerageWithdrawConvert.INSTANCE.convertPage(pageResult, userMap,brokerageWithdrawMap));
     }
 
     // TODO @luchi：update-transferred，url 改成这个。和 update-paid 、update-refunded 保持一致
@@ -91,4 +115,123 @@ public class BrokerageWithdrawController {
     }
 
 
+    @GetMapping("/get-supply-info")
+    @Operation(summary = "获得申请结算信息")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:query')")
+    public CommonResult<BrokerageSupplyInfoRespVO> getBrokerageSupplyInfo() {
+        Long sysUserId = getLoginUserId();
+        AgentInfoRespDTO agentInfoRespDTO = agentInfoApi.getInfoBySysUserId(sysUserId);
+        BrokerageSupplyInfoRespVO brokerageSupplyInfoRespVO = new BrokerageSupplyInfoRespVO();
+        if(agentInfoRespDTO != null && agentInfoRespDTO.getUserId() != null){
+            MemberUserRespDTO memberUserRespDTO = memberUserApi.getUser(agentInfoRespDTO.getUserId());
+            BrokerageUserDO brokerageUserDO = brokerageUserService.getBrokerageUser(agentInfoRespDTO.getUserId());
+            if(memberUserRespDTO != null && brokerageUserDO != null){
+                //设置代理商信息
+                brokerageSupplyInfoRespVO.setUserId(agentInfoRespDTO.getUserId());
+                brokerageSupplyInfoRespVO.setAgentId(agentInfoRespDTO.getId());
+                brokerageSupplyInfoRespVO.setAgentName(agentInfoRespDTO.getAgentName());
+                brokerageSupplyInfoRespVO.setBankName(agentInfoRespDTO.getBankName());
+                brokerageSupplyInfoRespVO.setBankCardNo(agentInfoRespDTO.getBankCardNo());
+                brokerageSupplyInfoRespVO.setWechatAccountQrCodeUrl(agentInfoRespDTO.getWechatAccountQrCodeUrl());
+                brokerageSupplyInfoRespVO.setWechatAccount(agentInfoRespDTO.getWechatAccount());
+                brokerageSupplyInfoRespVO.setAlipayAccountQrCodeUrl(agentInfoRespDTO.getAlipayAccountQrCodeUrl());
+                brokerageSupplyInfoRespVO.setAlipayAccount(agentInfoRespDTO.getAlipayAccount());
+
+                //设置用户信息
+                brokerageSupplyInfoRespVO.setRealName(memberUserRespDTO.getName());
+
+                //设置分销用户信息
+                brokerageSupplyInfoRespVO.setBrokeragePrice(brokerageUserDO.getBrokeragePrice());
+                brokerageSupplyInfoRespVO.setFrozenPrice(brokerageUserDO.getFrozenPrice());
+                Integer agentPrice = brokerageUserDO.getBrokeragePrice() + brokerageUserDO.getFrozenPrice();
+                brokerageSupplyInfoRespVO.setAgentPrice(agentPrice);
+            }
+        }
+        return success(brokerageSupplyInfoRespVO);
+    }
+
+    @PostMapping("/create-supply")
+    @Operation(summary = "结算申请")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:create')")
+    public CommonResult<Long> createBrokerageWithdraw(@Valid @RequestBody BrokerageSupplyInfoRespVO reqVO) {
+        if (reqVO.getUserId() == null){
+            return error(400, "当前用户未绑定代理商");
+        }
+        if(reqVO.getAgentPrice() != null && reqVO.getAgentPrice() <= 0){
+            return error(400, "代理商佣金不足");
+        }
+        if(reqVO.getBrokeragePrice() != null && reqVO.getSupplyPrice() > reqVO.getBrokeragePrice()){
+            return error(400, "提现金额不能大于可用佣金");
+        }
+        BrokerageWithdrawDO brokerageWithdrawDO = new BrokerageWithdrawDO();
+        brokerageWithdrawDO.setUserId(reqVO.getUserId());
+
+        brokerageWithdrawDO.setPrice(reqVO.getSupplyPrice());
+        brokerageWithdrawDO.setTotalPrice(reqVO.getAgentPrice());
+        brokerageWithdrawDO.setType(reqVO.getClosingType());
+        //代理商信息
+        brokerageWithdrawDO.setAgentId(reqVO.getAgentId());
+        brokerageWithdrawDO.setAgentName(reqVO.getAgentName());
+        brokerageWithdrawDO.setName(reqVO.getRealName() != null ? reqVO.getRealName() : "");
+        brokerageWithdrawDO.setBankName(reqVO.getBankName() != null ? reqVO.getBankName() : "");
+
+        //银行
+        if(reqVO.getClosingType() == 2){
+            brokerageWithdrawDO.setAccountNo(reqVO.getBankCardNo());
+        }
+        //微信
+        else if(reqVO.getClosingType() == 3){
+            brokerageWithdrawDO.setAccountNo(reqVO.getWechatAccount());
+            brokerageWithdrawDO.setAccountQrCodeUrl(reqVO.getWechatAccountQrCodeUrl());
+        }
+        //支付宝
+        else if(reqVO.getClosingType() == 4){
+            brokerageWithdrawDO.setAccountNo(reqVO.getAlipayAccount());
+            brokerageWithdrawDO.setAccountQrCodeUrl(reqVO.getAlipayAccountQrCodeUrl());
+        }
+        brokerageWithdrawDO.setStatus(0);
+        brokerageWithdrawDO.setRemark(reqVO.getRemark() != null ? reqVO.getRemark() : "");
+
+        Long id = brokerageWithdrawService.createSupply(brokerageWithdrawDO);
+        return success(id);
+    }
+
+    /*
+     * 导出佣金提现
+     * */
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出结算管理 Excel")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-withdraw:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBrokerageWithdrawExcel(@Valid BrokerageWithdrawPageReqVO pageVO,
+                                             HttpServletResponse response) throws IOException {
+        pageVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+       /* List<AdminUserRespDTO> list = adminUserApi.getAdminUserByCode("super_admin");
+        List<AdminUserRespDTO> users = adminUserApi.getAdminUserByCode("dfhg");
+        Long userId = getLoginUserId();
+        AgentInfoRespDTO agentInfoRespDTO = new AgentInfoRespDTO();
+        if(!list.get(0).getId().equals(userId) && !users.get(0).getId().equals(userId)){
+            agentInfoRespDTO = agentInfoApi.getInfoBySysUserId(userId);
+            if(agentInfoRespDTO != null && agentInfoRespDTO.getUserId() != null){
+                pageVO.setUserId(agentInfoRespDTO.getUserId());
+            }
+        }*/
+        // 分页查询
+        PageResult<BrokerageWithdrawDO> pageResult = brokerageWithdrawService.getBrokerageWithdrawPage(pageVO);
+
+        Set<Long> userIds = convertSet(pageResult.getList(), BrokerageWithdrawDO::getUserId);
+        // 拼接信息
+        Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(
+                convertSet(pageResult.getList(), BrokerageWithdrawDO::getUserId));
+        Map<Long, BrokerageWithdrawRespVO> brokerageWithdrawMap =  brokerageWithdrawService.getBrokerageWithdrawMap(userIds);
+        PageResult<BrokerageWithdrawRespVO> page = BrokerageWithdrawConvert.INSTANCE.convertPage(pageResult, userMap,brokerageWithdrawMap);
+        /*if(agentInfoRespDTO == null && !list.get(0).getId().equals(userId) && !users.get(0).getId().equals(userId)){
+            page = new PageResult<>();
+        }*/
+        // 导出 Excel
+        ExcelUtils.write(response, "提现审核.xls", "数据", BrokerageWithdrawRespVO.class,
+                page.getList());
+    }
+
+
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageSupplyInfoRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageSupplyInfoRespVO.java
new file mode 100644
index 0000000..0577d5c
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageSupplyInfoRespVO.java
@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BrokerageSupplyInfoRespVO {
+
+    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Long userId;
+
+
+    @Schema(description = "代理商余额", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Integer agentPrice;
+
+
+    @Schema(description = "可用佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Integer brokeragePrice;
+    /**
+     * 冻结佣金
+     */
+    @Schema(description = "冻结佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Integer frozenPrice;
+
+    @Schema(description = "代理商id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Long agentId;
+
+    @Schema(description = "代理商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String agentName;
+
+    @Schema(description = "结算类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Integer closingType;
+
+    @Schema(description = "微信收款二维码", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String wechatAccountQrCodeUrl;
+
+    @Schema(description = "支付宝收款二维码", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String alipayAccountQrCodeUrl;
+
+    @Schema(description = "微信账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String wechatAccount;
+
+    @Schema(description = "支付宝账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String alipayAccount;
+
+    @Schema(description = "开户行", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String bankName;
+
+    @Schema(description = "银行卡号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String bankCardNo;
+
+    @Schema(description = "真实姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String realName;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private String remark;
+
+    @Schema(description = "提现金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "7161")
+    private Integer supplyPrice;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
index e84569e..0414849 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
@@ -66,14 +66,14 @@ public class BrokerageWithdrawBaseVO {
     @Schema(description = "备注", example = "随便")
     private String remark;
 
-  /*  @Schema(description = "代理商id", example = "1")
+   @Schema(description = "代理商id", example = "1")
     private Long agentId;
 
     @Schema(description = "代理商名称", example = "谁便")
     @ExcelProperty("代理商名称")
     private String agentName;
 
-    @Schema(description = "凭证", example = "谁便")
+  /*  @Schema(description = "凭证", example = "谁便")
     @ExcelProperty("凭证")
     private String voucher;*/
 
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java
index 4b818af..2d80363 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java
@@ -35,10 +35,16 @@ public interface BrokerageWithdrawConvert {
 
     PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> page);
 
-    default PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> pageResult, Map<Long, MemberUserRespDTO> userMap) {
+    default PageResult<BrokerageWithdrawRespVO> convertPage(PageResult<BrokerageWithdrawDO> pageResult,
+                                                            Map<Long, MemberUserRespDTO> userMap,
+                                                            Map<Long,BrokerageWithdrawRespVO> broMap) {
         PageResult<BrokerageWithdrawRespVO> result = convertPage(pageResult);
         for (BrokerageWithdrawRespVO vo : result.getList()) {
             vo.setUserNickname(Optional.ofNullable(userMap.get(vo.getUserId())).map(MemberUserRespDTO::getNickname).orElse(null));
+            Optional.ofNullable(broMap.get(vo.getUserId())).ifPresent(brokerageWithdrawRespVO -> {
+                vo.setAgentId(brokerageWithdrawRespVO.getAgentId());
+                vo.setAgentName(brokerageWithdrawRespVO.getAgentName());
+            });
         }
         return result;
     }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java
index 6c552a2..942fbf7 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageWithdrawDO.java
@@ -123,4 +123,14 @@ public class BrokerageWithdrawDO extends BaseDO {
      */
     private String transferStatus;
 
+
+    /*
+    * 代理商id
+    * */
+    private Long agentId;
+
+    /*
+     * 代理商名称
+     * */
+    private String agentName;
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
index 8f44f8d..e27c69b 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
@@ -27,6 +28,7 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageEnabledConditionEn
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.stereotype.Service;
@@ -412,7 +414,8 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
 
     @Override
     public List<Long> getBrokerageUserIds() {
-        List<Long> list = brokerageUserMapper.selectList().stream().map(BrokerageUserDO::getId).collect(Collectors.toList());
+        List<Long> list = brokerageUserMapper.selectList(
+                new LambdaQueryWrapper<BrokerageUserDO>().eq(BaseDO::getDeleted,false)).stream().map(BrokerageUserDO::getId).collect(Collectors.toList());
         return list;
     }
 
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java
index 602d0f4..78a053f 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawService.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.service.brokerage;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO;
 import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
@@ -78,4 +79,8 @@ public interface BrokerageWithdrawService {
     }
 
     void updateBrokerageWithdrawTransferred(Long id, Long payTransferId);
+
+    Map<Long, BrokerageWithdrawRespVO> getBrokerageWithdrawMap(Set<Long> userIds);
+
+    Long createSupply(BrokerageWithdrawDO brokerageWithdrawDO);
 }
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
index cee578b..fc88b82 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
@@ -7,6 +7,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.module.agent.enums.api.agentinfo.AgentInfoApi;
+import cn.iocoder.yudao.module.agent.enums.api.agentinfo.dto.AgentInfoRespDTO;
 import cn.iocoder.yudao.module.pay.api.transfer.PayTransferApi;
 import cn.iocoder.yudao.module.pay.api.transfer.dto.PayTransferCreateReqDTO;
 import cn.iocoder.yudao.module.pay.api.transfer.dto.PayTransferRespDTO;
@@ -21,6 +23,7 @@ import cn.iocoder.yudao.module.system.api.social.SocialUserApi;
 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserRespDTO;
 import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum;
 import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO;
 import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawCreateReqVO;
 import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageWithdrawConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageWithdrawDO;
@@ -41,10 +44,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
@@ -86,6 +86,9 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService {
     @Resource
     private PayTransferApi payTransferApi;
 
+    @Resource
+    private AgentInfoApi agentInfoApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void auditBrokerageWithdraw(Integer id, BrokerageWithdrawStatusEnum status, String auditReason) {
@@ -270,5 +273,32 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService {
         return tradeConfig;
     }
 
+    @Override
+    public Map<Long, BrokerageWithdrawRespVO> getBrokerageWithdrawMap(Set<Long> userIds) {
+        if (CollUtil.isEmpty(userIds)){
+            return Collections.emptyMap();
+        }
+        Map<Long, BrokerageWithdrawRespVO> brokerageWithdrawMap = new HashMap<>();
+        for (Long userId : userIds){
+            AgentInfoRespDTO agentInfoRespDTO = agentInfoApi.getAgentByUserId(userId);
+            BrokerageWithdrawRespVO brokerageWithdrawRespVO = new BrokerageWithdrawRespVO();
+            brokerageWithdrawRespVO.setUserId(userId);
+            if(agentInfoRespDTO != null){
+                brokerageWithdrawRespVO.setAgentId(agentInfoRespDTO.getId());
+                brokerageWithdrawRespVO. setAgentName(agentInfoRespDTO.getAgentName());
+            }
+            brokerageWithdrawMap.put(userId,brokerageWithdrawRespVO);
+        }
+        return brokerageWithdrawMap;
+    }
+
+    @Override
+    public Long createSupply(BrokerageWithdrawDO brokerageWithdrawDO) {
+        if (brokerageWithdrawDO != null){
+            brokerageWithdrawMapper.insert(brokerageWithdrawDO);
+        }
+        return brokerageWithdrawDO.getId();
+    }
+
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
index 6e584b9..f3a1269 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
@@ -31,4 +31,16 @@ public class MemberConfigBaseVO {
     @Schema(description = "积分协议内容",  example = "100")
     private String content;
 
+    @Schema(description = "分享得积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "分享得积分")
+    private Integer pointTradeSharePoint;
+
+    @Schema(description = "好评得积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "好评得积分")
+    private Integer pointTradeGoodcommentPoint;
+
+    @Schema(description = "推广得积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "推广得积分")
+    private Integer pointTradePromotionPoint;
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java
index 6515d2e..2b35555 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java
@@ -50,6 +50,19 @@ public class MemberConfigDO extends BaseDO {
      */
     private String content;
 
+    /*
+    * 分享得积分
+    * */
+    private Integer pointTradeSharePoint;
 
+    /*
+    * 好评得积分
+    * */
+    private Integer pointTradeGoodcommentPoint;
+
+    /*
+    * 推广得积分
+    * */
+    private Integer pointTradePromotionPoint;
 
 }