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

# Conflicts:
#	src/views/member/user/UserForm.vue

src/api/member/level/index.ts

@@ -5,7 +5,7 @@ export interface LevelVO {
   name: string
   experience: number
   value: number
-  discount: number
+  discountPercent: number
   icon: string
   bgUrl: string
   status: number

src/api/member/point/config/index.ts

@@ -0,0 +1,19 @@
+import request from '@/config/axios'
+
+export interface ConfigVO {
+  id: number
+  tradeDeductEnable: number
+  tradeDeductUnitPrice: number
+  tradeDeductMaxPrice: number
+  tradeGivePoint: number
+}
+
+// 查询积分设置详情
+export const getConfig = async () => {
+  return await request.get({ url: `/member/point/config/get` })
+}
+
+// 新增修改积分设置
+export const saveConfig = async (data: ConfigVO) => {
+  return await request.put({ url: `/member/point/config/save`, data })
+}

src/api/member/point/record/index.ts

@@ -0,0 +1,18 @@
+import request from '@/config/axios'
+
+export interface RecordVO {
+  id: number
+  bizId: string
+  bizType: string
+  title: string
+  description: string
+  point: number
+  totalPoint: number
+  userId: number
+  createDate: Date
+}
+
+// 查询用户积分记录列表
+export const getRecordPage = async (params) => {
+  return await request.get({ url: `/member/point/record/page`, params })
+}

src/api/member/signin/config/index.ts

@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+
+export interface SignInConfigVO {
+  id: number
+  day: number | null
+  point: number | null
+  enable: boolean | null
+}
+
+// 查询积分签到规则列表
+export const getSignInConfigList = async () => {
+  return await request.get({ url: `/member/sign-in/config/list` })
+}
+
+// 查询积分签到规则详情
+export const getSignInConfig = async (id: number) => {
+  return await request.get({ url: `/member/sign-in/config/get?id=` + id })
+}
+
+// 新增积分签到规则
+export const createSignInConfig = async (data: SignInConfigVO) => {
+  return await request.post({ url: `/member/sign-in/config/create`, data })
+}
+
+// 修改积分签到规则
+export const updateSignInConfig = async (data: SignInConfigVO) => {
+  return await request.put({ url: `/member/sign-in/config/update`, data })
+}
+
+// 删除积分签到规则
+export const deleteSignInConfig = async (id: number) => {
+  return await request.delete({ url: `/member/sign-in/config/delete?id=` + id })
+}

src/api/member/signin/record/index.ts

@@ -0,0 +1,13 @@
+import request from '@/config/axios'
+
+export interface SignInRecordVO {
+  id: number
+  userId: number
+  day: number
+  point: number
+}
+
+// 查询用户签到积分列表
+export const getSignInRecordPage = async (params) => {
+  return await request.get({ url: `/member/sign-in/record/page`, params })
+}

src/api/member/user/index.ts

@@ -18,6 +18,25 @@ export interface UserVO {
   createTime: Date
 }
 
+// TODO @梦：和 UserVO 搞成一个把。
+export interface UserBaseInfoVO {
+  id: number | undefined | null
+  mobile: string
+  password: string | null | undefined
+  status: number
+  registerIp: string | null | undefined
+  loginIp: string | null | undefined
+  loginDate: Date | null | undefined
+  nickname: string | null | undefined
+  avatar: string | null | undefined
+  name: string | null | undefined
+  sex: number
+  areaId: number | null | undefined
+  birthday: Date | null | undefined
+  mark: string | null | undefined
+  createTime: Date | null | undefined
+}
+
 // 查询会员用户列表
 export const getUserPage = async (params) => {
   return await request.get({ url: `/member/user/page`, params })