diff --git a/src/api/mall/trade/brokerage/record/index.ts b/src/api/mall/trade/brokerage/record/index.ts new file mode 100644 index 00000000..7df9a225 --- /dev/null +++ b/src/api/mall/trade/brokerage/record/index.ts @@ -0,0 +1,11 @@ +import request from '@/config/axios' + +// 查询佣金记录列表 +export const getBrokerageRecordPage = async (params: any) => { + return await request.get({ url: `/trade/brokerage-record/page`, params }) +} + +// 查询佣金记录详情 +export const getBrokerageRecord = async (id: number) => { + return await request.get({ url: `/trade/brokerage-record/get?id=` + id }) +} 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..95f3a6a1 --- /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 + bindUserId: number + bindUserTime: Date + brokerageEnabled: boolean + brokerageTime: Date + price: number + frozenPrice: 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/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/brokerage/record/index.ts b/src/api/member/brokerage/record/index.ts deleted file mode 100644 index 33b6ab18..00000000 --- a/src/api/member/brokerage/record/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -import request from '@/config/axios' - -// 查询佣金记录列表 -export const getMemberBrokerageRecordPage = async (params: any) => { - return await request.get({ url: `/member/member-brokerage-record/page`, params }) -} - -// 查询佣金记录详情 -export const getMemberBrokerageRecord = async (id: number) => { - return await request.get({ url: `/member/member-brokerage-record/get?id=` + id }) -} 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/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 @@ 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 @@ + + + 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 @@ - + 下单积分是否抵用订单金额 @@ -46,111 +46,6 @@ - - - - 商城是否开启分销模式 - - - - - {{ dict.label }} - - - - 人人分销:每个用户都可以成为推广员 - - - 指定分销:仅可在后台手动设置推广员 - - - - - - {{ dict.label }} - - - - 没有推广人:只要用户没有推广人,随时都可以绑定推广关系 - - - 新用户:只有新用户注册时或首次进入系统时才可以绑定推广关系 - - - - - - 个人中心分销海报图片,建议尺寸600x1000 - - - - - - 订单交易成功后给推广人返佣的百分比 - - - - - - 订单交易成功后给推广人的推荐人返佣的百分比 - - - - - - 防止用户退款,佣金被提现了,所以需要设置佣金冻结时间,单位:天 - - - - - - 用户提现最低金额限制,单位:元 - - - - - - {{ dict.label }} - - - 商城开通提现的付款方式 - - - - - - 商城开通提现的银行列表 - - @@ -161,8 +56,6 @@ - -