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

src/api/crm/contact/index.ts

@@ -80,3 +80,8 @@ export const createContactBusinessList = async (data: ContactBusinessReqVO) => {
 export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
   return await request.delete({ url: `/crm/contact/delete-business-list`, data })
 }
+
+// 查询联系人操作日志
+export const getOperateLogPage = async (params: any) => {
+  return await request.get({ url: '/crm/contact/operate-log-page', params })
+}

src/api/crm/customer/index.ts

@@ -69,11 +69,24 @@ export const queryAllList = async () => {
 }
 
 // 查询客户操作日志
-export const getOperateLogPage = async (params: any) => {
-  return await request.get({ url: '/crm/customer/operate-log-page', params })
+export const getOperateLogPage = async (id: number) => {
+  return await request.get({ url: '/crm/customer/operate-log-page?id=' + id })
 }
 
+// ======================= 业务操作 =======================
+
 // 锁定/解锁客户
 export const lockCustomer = async (id: number, lockStatus: boolean) => {
   return await request.put({ url: `/crm/customer/lock`, data: { id, lockStatus } })
 }
+
+// TODO @puhui999：方法名，改成和后端一致哈
+// 领取公海客户
+export const receive = async (ids: any[]) => {
+  return await request.put({ url: '/crm/customer/receive', params: { ids: ids.join(',') } })
+}
+
+// 客户放入公海
+export const putPool = async (id: number) => {
+  return await request.put({ url: `/crm/customer/put-pool?id=${id}` })
+}

src/api/crm/permission/index.ts

@@ -58,15 +58,3 @@ export const deletePermissionBatch = async (params) => {
 export const deleteSelfPermission = async (id) => {
   return await request.delete({ url: '/crm/permission/quit-team?id=' + id })
 }
-
-// TODO @puhui999：调整下位置
-// 领取公海数据
-export const receive = async (data: { bizType: number; bizId: number }) => {
-  return await request.put({ url: `/crm/permission/receive`, data })
-}
-
-// TODO @puhui999：调整下位置
-// 数据放入公海
-export const putPool = async (data: { bizType: number; bizId: number }) => {
-  return await request.put({ url: `/crm/permission/put-pool`, data })
-}

src/api/mall/promotion/reward/rewardActivity.ts

@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export interface DiscountActivityVO {
+  id?: number
+  name?: string
+  startTime?: Date
+  endTime?: Date
+  remark?: string
+  conditionType?: number
+  productScope?: number
+  productSpuIds?: number[]
+  rules?: DiscountProductVO[]
+}
+
+// 优惠规则
+export interface DiscountProductVO {
+  limit: number
+  discountPrice: number
+  freeDelivery: boolean
+  point: number
+  couponIds: number[]
+  couponCounts: number[]
+}
+
+// 新增满减送活动
+export const createRewardActivity = async (data: DiscountActivityVO) => {
+  return await request.post({ url: '/promotion/reward-activity/create', data })
+}
+
+// 更新满减送活动
+export const updateRewardActivity = async (data: DiscountActivityVO) => {
+  return await request.put({ url: '/promotion/reward-activity/update', data })
+}
+
+// 查询满减送活动列表
+export const getRewardActivityPage = async (params) => {
+  return await request.get({ url: '/promotion/reward-activity/page', params })
+}
+
+// 查询满减送活动详情
+export const getReward = async (id: number) => {
+  return await request.get({ url: '/promotion/reward-activity/get?id=' + id })
+}
+
+// 删除限时折扣活动
+export const deleteRewardActivity = async (id: number) => {
+  return await request.delete({ url: '/promotion/reward-activity/delete?id=' + id })
+}

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

@@ -8,7 +8,6 @@ export interface ConfigVO {
   brokerageFirstPercent: number
   brokerageSecondPercent: number
   brokerageWithdrawMinPrice: number
-  brokerageBankNames: string
   brokerageFrozenDays: number
   brokerageWithdrawTypes: string
 }