Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate

# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue

src/api/bpm/task/index.ts

@@ -42,20 +42,14 @@ export const exportTask = async (params) => {
   return await request.download({ url: '/bpm/task/export', params })
 }
 
-/**
- * 获取所有可回退的节点
- * @param params
- */
+// 获取所有可回退的节点
 export const getReturnList = async (params) => {
   return await request.get({ url: '/bpm/task/get-return-list', params })
 }
 
-/**
- * 确认回退
- * @param params
- */
-export const okRollback = async (data) => {
-  return await request.put({ url: '/bpm/task/rollback', data })
+// 回退
+export const returnTask = async (data) => {
+  return await request.put({ url: '/bpm/task/return', data })
 }
 
 /**

src/api/mall/product/spu.ts

@@ -20,8 +20,8 @@ export interface Sku {
   stock?: number // 库存
   weight?: number // 商品重量，单位：kg 千克
   volume?: number // 商品体积，单位：m^3 平米
-  subCommissionFirstPrice?: number | string // 一级分销的佣金
-  subCommissionSecondPrice?: number | string // 二级分销的佣金
+  firstBrokerageRecord?: number | string // 一级分销的佣金
+  secondBrokerageRecord?: number | string // 二级分销的佣金
   salesCount?: number // 商品销量
 }
 

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 })
+}

src/api/mall/trade/brokerage/user/index.ts

@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export interface BrokerageUserVO {
+  id: number
+  bindUserId: number
+  bindUserTime: Date
+  brokerageEnabled: boolean
+  brokerageTime: Date
+  price: number
+  frozenPrice: number
+
+  nickname: string
+  avatar: string
+}
+
+// 查询分销用户列表
+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 })
+}
+
+// 修改推广员
+export const updateBindUser = async (data: any) => {
+  return await request.put({ url: `/trade/brokerage-user/update-bind-user`, data })
+}
+
+// 清除推广员
+export const clearBindUser = async (data: any) => {
+  return await request.put({ url: `/trade/brokerage-user/clear-bind-user`, data })
+}
+
+// 修改推广资格
+export const updateBrokerageEnabled = async (data: any) => {
+  return await request.put({ url: `/trade/brokerage-user/update-brokerage-enable`, data })
+}

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 })
+}

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 })
+}

src/api/mall/trade/order/index.ts

@@ -51,12 +51,13 @@ export interface OrderVO {
     avatar?: string
   }
   // 订单操作日志
-  orderLog: orderLog[]
+  logs?: OrderLogRespVO[]
 }
 
-export interface orderLog {
+export interface OrderLogRespVO {
   content?: string
   createTime?: Date
+  userType?: number
 }
 
 export interface OrderItemRespVO {

src/api/member/experience-record/index.ts

@@ -0,0 +1,22 @@
+import request from '@/config/axios'
+
+export interface ExperienceRecordVO {
+  id: number
+  userId: number
+  bizId: string
+  bizType: number
+  title: string
+  description: string
+  experience: number
+  totalExperience: number
+}
+
+// 查询会员经验记录列表
+export const getExperienceRecordPage = async (params) => {
+  return await request.get({ url: `/member/experience-record/page`, params })
+}
+
+// 查询会员经验记录详情
+export const getExperienceRecord = async (id: number) => {
+  return await request.get({ url: `/member/experience-record/get?id=` + id })
+}