1、会员模块

会员等级功能实现
pull/254/head
xjs 4 years ago
parent d75497c7bc
commit 383ca913d5

@ -0,0 +1,48 @@
import request from '@/utils/request'
// 获取会员等级列表
export function getMemberLevelList(params) {
return request({
url: `/mall-member/member/memberlevel/list`,
method: 'get',
params:params
})
}
// 删除会员等级列表
export function delMemberLevel(ids) {
return request({
url: `/mall-member/member/memberlevel/delete`,
method: 'delete',
data:ids
})
}
// 过去会员等级具体信息
export function getMemberLevel(id) {
return request({
url: `/mall-member/member/memberlevel/info/${id}`,
method: 'get',
})
}
// 保存会员等级信息
export function saveMemberLevel(data) {
return request({
url: `/mall-member/member/memberlevel/save`,
method: 'post',
data:data
})
}
// 修改会员等级信息
export function editMemberLevel(data) {
return request({
url: `/mall-member/member/memberlevel/update`,
method: 'put',
data:data
})
}

@ -0,0 +1,203 @@
<template>
<div class="app-container">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="请输入等级名称、备注等" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button @click="getDataList()"></el-button>
<el-button
type="primary"
@click="addOrUpdateHandle()"
>新增
</el-button>
<el-button
type="danger"
@click="deleteHandle()"
:disabled="dataListSelections.length <= 0"
>批量删除
</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;"
>
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="等级名称"></el-table-column>
<el-table-column prop="growthPoint" header-align="center" align="center" label="所需成长值"></el-table-column>
<el-table-column prop="defaultStatus" header-align="center" align="center" label="默认等级">
<template slot-scope="scope">
<i class="el-icon-success" v-if="scope.row.defaultStatus===1"></i>
<i class="el-icon-error" v-else></i>
</template>
</el-table-column>
<el-table-column prop="freeFreightPoint" header-align="center" align="center" label="免运费标准"></el-table-column>
<el-table-column
prop="commentGrowthPoint"
header-align="center"
align="center"
label="评价获取成长值"
></el-table-column>
<el-table-column label="特权" align="center">
<el-table-column
prop="priviledgeFreeFreight"
header-align="center"
align="center"
label="免邮特权"
>
<template slot-scope="scope">
<i class="el-icon-success" v-if="scope.row.priviledgeFreeFreight===1"></i>
<i class="el-icon-error" v-else></i>
</template>
</el-table-column>
<el-table-column
prop="priviledgeMemberPrice"
header-align="center"
align="center"
label="会员价格特权"
>
<template slot-scope="scope">
<i class="el-icon-success" v-if="scope.row.priviledgeMemberPrice===1"></i>
<i class="el-icon-error" v-else></i>
</template>
</el-table-column>
<el-table-column
prop="priviledgeBirthday"
header-align="center"
align="center"
label="生日特权"
>
<template slot-scope="scope">
<i class="el-icon-success" v-if="scope.row.priviledgeBirthday===1"></i>
<i class="el-icon-error" v-else></i>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="note" header-align="center" align="center" label="备注"></el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"></el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)"></el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</template>
<script>
import AddOrUpdate from "./memberlevel-add-or-update";
import {delMemberLevel, getMemberLevelList} from "@/api/mall/member/level";
export default {
data() {
return {
dataForm: {
key: ""
},
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false
};
},
components: {
AddOrUpdate
},
created() {
this.getDataList();
},
methods: {
//
getDataList() {
this.dataListLoading = true;
let data = {
page: this.pageIndex,
limit: this.pageSize,
key: this.dataForm.key
}
getMemberLevelList(data).then(res => {
this.dataList = res.page.list;
this.totalPage = res.page.totalCount;
this.dataListLoading = false;
})
},
//
sizeChangeHandle(val) {
this.pageSize = val;
this.pageIndex = 1;
this.getDataList();
},
//
currentChangeHandle(val) {
this.pageIndex = val;
this.getDataList();
},
//
selectionChangeHandle(val) {
this.dataListSelections = val;
},
// /
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id);
});
},
//
deleteHandle(id) {
var ids = id ? [id] : this.dataListSelections.map(item => {
return item.id;
});
this.$confirm(
`确定对[id=${ids.join(",")}]进行[${id ? "删除" : "批量删除"}]操作?`, "提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}
).then(() => {
delMemberLevel(ids).then(res => {
this.$modal.notifySuccess("删除成功")
this.getDataList();
})
});
},
/** 重置按钮操作 */
resetQuery() {
this.dataForm = {}
this.catId = 0
this.pageIndex = 1;
this.getDataList();
},
}
};
</script>

@ -0,0 +1,228 @@
<template>
<el-dialog
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
<el-form-item label="会员等级id" prop="levelId">
<el-input v-model="dataForm.levelId" placeholder="会员等级id"></el-input>
</el-form-item>
<el-form-item label="用户名" prop="username">
<el-input v-model="dataForm.username" placeholder="用户名"></el-input>
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="dataForm.password" placeholder="密码"></el-input>
</el-form-item>
<el-form-item label="昵称" prop="nickname">
<el-input v-model="dataForm.nickname" placeholder="昵称"></el-input>
</el-form-item>
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号码"></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
</el-form-item>
<el-form-item label="头像" prop="header">
<el-input v-model="dataForm.header" placeholder="头像"></el-input>
</el-form-item>
<el-form-item label="性别" prop="gender">
<el-input v-model="dataForm.gender" placeholder="性别"></el-input>
</el-form-item>
<el-form-item label="生日" prop="birth">
<el-input v-model="dataForm.birth" placeholder="生日"></el-input>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input v-model="dataForm.city" placeholder="所在城市"></el-input>
</el-form-item>
<el-form-item label="职业" prop="job">
<el-input v-model="dataForm.job" placeholder="职业"></el-input>
</el-form-item>
<el-form-item label="个性签名" prop="sign">
<el-input v-model="dataForm.sign" placeholder="个性签名"></el-input>
</el-form-item>
<el-form-item label="用户来源" prop="sourceType">
<el-input v-model="dataForm.sourceType" placeholder="用户来源"></el-input>
</el-form-item>
<el-form-item label="积分" prop="integration">
<el-input v-model="dataForm.integration" placeholder="积分"></el-input>
</el-form-item>
<el-form-item label="成长值" prop="growth">
<el-input v-model="dataForm.growth" placeholder="成长值"></el-input>
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-input v-model="dataForm.status" placeholder="启用状态"></el-input>
</el-form-item>
<el-form-item label="注册时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="注册时间"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()"></el-button>
</span>
</el-dialog>
</template>
<script>
export default {
data () {
return {
visible: false,
dataForm: {
id: 0,
levelId: '',
username: '',
password: '',
nickname: '',
mobile: '',
email: '',
header: '',
gender: '',
birth: '',
city: '',
job: '',
sign: '',
sourceType: '',
integration: '',
growth: '',
status: '',
createTime: ''
},
dataRule: {
levelId: [
{ required: true, message: '会员等级id不能为空', trigger: 'blur' }
],
username: [
{ required: true, message: '用户名不能为空', trigger: 'blur' }
],
password: [
{ required: true, message: '密码不能为空', trigger: 'blur' }
],
nickname: [
{ required: true, message: '昵称不能为空', trigger: 'blur' }
],
mobile: [
{ required: true, message: '手机号码不能为空', trigger: 'blur' }
],
email: [
{ required: true, message: '邮箱不能为空', trigger: 'blur' }
],
header: [
{ required: true, message: '头像不能为空', trigger: 'blur' }
],
gender: [
{ required: true, message: '性别不能为空', trigger: 'blur' }
],
birth: [
{ required: true, message: '生日不能为空', trigger: 'blur' }
],
city: [
{ required: true, message: '所在城市不能为空', trigger: 'blur' }
],
job: [
{ required: true, message: '职业不能为空', trigger: 'blur' }
],
sign: [
{ required: true, message: '个性签名不能为空', trigger: 'blur' }
],
sourceType: [
{ required: true, message: '用户来源不能为空', trigger: 'blur' }
],
integration: [
{ required: true, message: '积分不能为空', trigger: 'blur' }
],
growth: [
{ required: true, message: '成长值不能为空', trigger: 'blur' }
],
status: [
{ required: true, message: '启用状态不能为空', trigger: 'blur' }
],
createTime: [
{ required: true, message: '注册时间不能为空', trigger: 'blur' }
]
}
}
},
methods: {
init (id) {
this.dataForm.id = id || 0
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/member/member/info/${this.dataForm.id}`),
method: 'get',
params: this.$http.adornParams()
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm.levelId = data.member.levelId
this.dataForm.username = data.member.username
this.dataForm.password = data.member.password
this.dataForm.nickname = data.member.nickname
this.dataForm.mobile = data.member.mobile
this.dataForm.email = data.member.email
this.dataForm.header = data.member.header
this.dataForm.gender = data.member.gender
this.dataForm.birth = data.member.birth
this.dataForm.city = data.member.city
this.dataForm.job = data.member.job
this.dataForm.sign = data.member.sign
this.dataForm.sourceType = data.member.sourceType
this.dataForm.integration = data.member.integration
this.dataForm.growth = data.member.growth
this.dataForm.status = data.member.status
this.dataForm.createTime = data.member.createTime
}
})
}
})
},
//
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`/member/member/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,
'levelId': this.dataForm.levelId,
'username': this.dataForm.username,
'password': this.dataForm.password,
'nickname': this.dataForm.nickname,
'mobile': this.dataForm.mobile,
'email': this.dataForm.email,
'header': this.dataForm.header,
'gender': this.dataForm.gender,
'birth': this.dataForm.birth,
'city': this.dataForm.city,
'job': this.dataForm.job,
'sign': this.dataForm.sign,
'sourceType': this.dataForm.sourceType,
'integration': this.dataForm.integration,
'growth': this.dataForm.growth,
'status': this.dataForm.status,
'createTime': this.dataForm.createTime
})
}).then(({data}) => {
if (data && data.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
} else {
this.$message.error(data.msg)
}
})
}
})
}
}
}
</script>

@ -0,0 +1,169 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()"></el-button>
<!-- <el-button v-if="isAuth('member:member:save')" type="primary" @click="addOrUpdateHandle()"></el-button>
<el-button v-if="isAuth('member:member:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0"></el-button>-->
</el-form-item>
</el-form>
<el-table
:data="dataList"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;"
>
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="id"></el-table-column>
<el-table-column prop="levelId" header-align="center" align="center" label="会员等级"></el-table-column>
<el-table-column prop="username" header-align="center" align="center" label="用户名"></el-table-column>
<el-table-column prop="nickname" header-align="center" align="center" label="昵称"></el-table-column>
<el-table-column prop="mobile" header-align="center" align="center" label="手机号码"></el-table-column>
<el-table-column prop="email" header-align="center" align="center" label="邮箱"></el-table-column>
<el-table-column prop="header" header-align="center" align="center" label="头像"></el-table-column>
<el-table-column prop="gender" header-align="center" align="center" label="性别"></el-table-column>
<el-table-column prop="birth" header-align="center" align="center" label="生日"></el-table-column>
<el-table-column prop="city" header-align="center" align="center" label="所在城市"></el-table-column>
<el-table-column prop="job" header-align="center" align="center" label="职业"></el-table-column>
<el-table-column prop="sign" header-align="center" align="center" label="个性签名"></el-table-column>
<el-table-column prop="sourceType" header-align="center" align="center" label="用户来源"></el-table-column>
<el-table-column prop="integration" header-align="center" align="center" label="积分"></el-table-column>
<el-table-column prop="growth" header-align="center" align="center" label="成长值"></el-table-column>
<el-table-column prop="status" header-align="center" align="center" label="启用状态">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-color="#13ce66"
inactive-color="#ff4949"
:active-value="1"
:inactive-value="0"
></el-switch>
</template>
</el-table-column>
<el-table-column prop="createTime" header-align="center" align="center" label="注册时间"></el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small">送券</el-button>
<el-button type="text" size="small">查订单</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</template>
<script>
import AddOrUpdate from "./member-add-or-update";
export default {
data() {
return {
dataForm: {
key: ""
},
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false
};
},
components: {
AddOrUpdate
},
activated() {
this.getDataList();
},
methods: {
//
getDataList() {
this.dataListLoading = true;
this.$http({
url: this.$http.adornUrl("/member/member/list"),
method: "get",
params: this.$http.adornParams({
page: this.pageIndex,
limit: this.pageSize,
key: this.dataForm.key
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataList = data.page.list;
this.totalPage = data.page.totalCount;
} else {
this.dataList = [];
this.totalPage = 0;
}
this.dataListLoading = false;
});
},
//
sizeChangeHandle(val) {
this.pageSize = val;
this.pageIndex = 1;
this.getDataList();
},
//
currentChangeHandle(val) {
this.pageIndex = val;
this.getDataList();
},
//
selectionChangeHandle(val) {
this.dataListSelections = val;
},
// /
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id);
});
}
//
// deleteHandle (id) {
// var ids = id ? [id] : this.dataListSelections.map(item => {
// return item.id
// })
// this.$confirm(`[id=${ids.join(',')}][${id ? '' : ''}]?`, '', {
// confirmButtonText: '',
// cancelButtonText: '',
// type: 'warning'
// }).then(() => {
// this.$http({
// url: this.$http.adornUrl('/member/member/delete'),
// method: 'post',
// data: this.$http.adornData(ids, false)
// }).then(({data}) => {
// if (data && data.code === 0) {
// this.$message({
// message: '',
// type: 'success',
// duration: 1500,
// onClose: () => {
// this.getDataList()
// }
// })
// } else {
// this.$message.error(data.msg)
// }
// })
// })
// }
}
};
</script>

@ -0,0 +1,140 @@
<template>
<el-dialog
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
width="500px"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
label-width="110px">
<el-form-item label="等级名称" prop="name">
<el-input v-model="dataForm.name" placeholder="等级名称"></el-input>
</el-form-item>
<el-form-item label="所需成长值" prop="growthPoint">
<el-input-number v-model="dataForm.growthPoint" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="默认等级" prop="defaultStatus">
<el-checkbox v-model="dataForm.defaultStatus" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
<el-form-item label="免运费标准" prop="freeFreightPoint">
<el-input-number :min="0" v-model="dataForm.freeFreightPoint"></el-input-number>
</el-form-item>
<el-form-item label="评价成长值" prop="commentGrowthPoint">
<el-input-number :min="0" v-model="dataForm.commentGrowthPoint"></el-input-number>
</el-form-item>
<el-form-item label="免邮特权" prop="priviledgeFreeFreight">
<el-checkbox v-model="dataForm.priviledgeFreeFreight" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
<el-form-item label="会员价格特权" prop="priviledgeMemberPrice">
<el-checkbox v-model="dataForm.priviledgeMemberPrice" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
<el-form-item label="生日特权" prop="priviledgeBirthday">
<el-checkbox v-model="dataForm.priviledgeBirthday" :true-label="1" :false-label="0"></el-checkbox>
</el-form-item>
<el-form-item label="备注" prop="note">
<el-input v-model="dataForm.note" placeholder="备注"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()"></el-button>
</span>
</el-dialog>
</template>
<script>
import {editMemberLevel, getMemberLevel, saveMemberLevel} from "@/api/mall/member/level";
export default {
data() {
return {
visible: false,
dataForm: {
name: '',
growthPoint: 0,
defaultStatus: 0,
freeFreightPoint: 0,
commentGrowthPoint: 0,
priviledgeFreeFreight: 0,
priviledgeMemberPrice: 0,
priviledgeBirthday: 0,
note: ""
},
dataRule: {
name: [
{required: true, message: '等级名称不能为空', trigger: 'blur'}
],
growthPoint: [
{required: true, message: '等级需要的成长值不能为空', trigger: 'blur'}
],
defaultStatus: [
{required: true, message: '是否为默认等级[0->不是1->是]不能为空', trigger: 'blur'}
],
freeFreightPoint: [
{required: true, message: '免运费标准不能为空', trigger: 'blur'}
],
commentGrowthPoint: [
{required: true, message: '每次评价获取的成长值不能为空', trigger: 'blur'}
],
priviledgeFreeFreight: [
{required: true, message: '是否有免邮特权不能为空', trigger: 'blur'}
],
priviledgeMemberPrice: [
{required: true, message: '是否有会员价格特权不能为空', trigger: 'blur'}
],
priviledgeBirthday: [
{required: true, message: '是否有生日特权不能为空', trigger: 'blur'}
],
note: [
{required: true, message: '备注不能为空', trigger: 'blur'}
]
}
}
},
methods: {
init(id) {
this.dataForm.id = id
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
getMemberLevel(this.dataForm.id).then(res => {
this.dataForm.name = res.memberLevel.name
this.dataForm.growthPoint = res.memberLevel.growthPoint || 0
this.dataForm.defaultStatus = res.memberLevel.defaultStatus || 0
this.dataForm.freeFreightPoint = res.memberLevel.freeFreightPoint || 0
this.dataForm.commentGrowthPoint = res.memberLevel.commentGrowthPoint || 0
this.dataForm.priviledgeFreeFreight = res.memberLevel.priviledgeFreeFreight || 0
this.dataForm.priviledgeMemberPrice = res.memberLevel.priviledgeMemberPrice || 0
this.dataForm.priviledgeBirthday = res.memberLevel.priviledgeBirthday || 0
this.dataForm.note = res.memberLevel.note
})
}
})
},
//
dataFormSubmit() {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (!this.dataForm.id) {
saveMemberLevel(this.dataForm).then(res => {
this.$modal.notifySuccess("添加成功")
this.visible = false
this.$emit('refreshDataList')
}
)
} else {
editMemberLevel(this.dataForm).then(res => {
this.$modal.notifySuccess("修改成功")
this.visible = false
this.$emit('refreshDataList')
})
}
}
})
},
}
}
</script>

@ -1,20 +1,18 @@
package com.xjs.mall.member.controller;
import java.util.Arrays;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.xjs.mall.member.entity.MemberLevelEntity;
import com.xjs.mall.member.service.MemberLevelService;
import com.xjs.utils.PageUtils;
import com.xjs.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
/**
@ -22,10 +20,11 @@ import com.xjs.utils.R;
*
* @author xiejs
* @email 1294405880@qq.com
* @date 2022-03-15 10:30:19
* @since 2022-03-15 10:30:19
*/
@RestController
@RequestMapping("member/memberlevel")
@Api(tags = "商城-会员-会员等级")
public class MemberLevelController {
@Autowired
private MemberLevelService memberLevelService;
@ -34,7 +33,8 @@ public class MemberLevelController {
*
*/
@RequestMapping("/list")
public R list(@RequestParam Map<String, Object> params){
@ApiOperation("列表")
public R list(@RequestParam Map<String, Object> params) {
PageUtils page = memberLevelService.queryPage(params);
return R.ok().put("page", page);
@ -45,8 +45,9 @@ public class MemberLevelController {
*
*/
@RequestMapping("/info/{id}")
public R info(@PathVariable("id") Long id){
MemberLevelEntity memberLevel = memberLevelService.getById(id);
@ApiOperation("信息")
public R info(@PathVariable("id") Long id) {
MemberLevelEntity memberLevel = memberLevelService.getById(id);
return R.ok().put("memberLevel", memberLevel);
}
@ -55,8 +56,10 @@ public class MemberLevelController {
*
*/
@RequestMapping("/save")
public R save(@RequestBody MemberLevelEntity memberLevel){
memberLevelService.save(memberLevel);
@ApiOperation("保存")
@Log(title = "会员等级", businessType = BusinessType.INSERT)
public R save(@RequestBody MemberLevelEntity memberLevel) {
memberLevelService.save(memberLevel);
return R.ok();
}
@ -65,8 +68,10 @@ public class MemberLevelController {
*
*/
@RequestMapping("/update")
public R update(@RequestBody MemberLevelEntity memberLevel){
memberLevelService.updateById(memberLevel);
@ApiOperation("修改")
@Log(title = "会员等级", businessType = BusinessType.UPDATE)
public R update(@RequestBody MemberLevelEntity memberLevel) {
memberLevelService.updateById(memberLevel);
return R.ok();
}
@ -75,8 +80,10 @@ public class MemberLevelController {
*
*/
@RequestMapping("/delete")
public R delete(@RequestBody Long[] ids){
memberLevelService.removeByIds(Arrays.asList(ids));
@ApiOperation("删除")
@Log(title = "会员等级", businessType = BusinessType.DELETE)
public R delete(@RequestBody Long[] ids) {
memberLevelService.removeByIds(Arrays.asList(ids));
return R.ok();
}

@ -1,16 +1,17 @@
package com.xjs.mall.member.service.impl;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xjs.utils.PageUtils;
import com.xjs.utils.Query;
import com.ruoyi.common.core.utils.StringUtils;
import com.xjs.mall.member.dao.MemberLevelDao;
import com.xjs.mall.member.entity.MemberLevelEntity;
import com.xjs.mall.member.service.MemberLevelService;
import com.xjs.utils.PageUtils;
import com.xjs.utils.Query;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service("memberLevelService")
@ -18,10 +19,12 @@ public class MemberLevelServiceImpl extends ServiceImpl<MemberLevelDao, MemberLe
@Override
public PageUtils queryPage(Map<String, Object> params) {
IPage<MemberLevelEntity> page = this.page(
new Query<MemberLevelEntity>().getPage(params),
new QueryWrapper<MemberLevelEntity>()
);
String key = (String) params.get(Query.KEY_NAME);
LambdaQueryWrapper<MemberLevelEntity> wrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(key)) {
wrapper.like(MemberLevelEntity::getName, key).or().like(MemberLevelEntity::getNote, key);
}
IPage<MemberLevelEntity> page = this.page(new Query<MemberLevelEntity>().getPage(params), wrapper);
return new PageUtils(page);
}

@ -62,7 +62,7 @@ public class AttrServiceImpl extends ServiceImpl<AttrDao, AttrEntity> implements
super.save(attrEntity);
//保存关联关系
if (attr.getAttrType() == ATTR_TYPE_BASE.getCode()) {
if (attr.getAttrType() == ATTR_TYPE_BASE.getCode() && attr.getAttrGroupId()!=null) {
AttrAttrgroupRelationEntity attrAttrgroupRelationEntity = new AttrAttrgroupRelationEntity();
attrAttrgroupRelationEntity.setAttrGroupId(attr.getAttrGroupId());
attrAttrgroupRelationEntity.setAttrId(attrEntity.getAttrId());
@ -100,7 +100,7 @@ public class AttrServiceImpl extends ServiceImpl<AttrDao, AttrEntity> implements
AttrAttrgroupRelationEntity attrId = attrAttrgroupRelationDao.selectOne(new LambdaQueryWrapper<AttrAttrgroupRelationEntity>()
.eq(AttrAttrgroupRelationEntity::getAttrId, attrEntity.getAttrId()));
if (attrId != null) {
if (attrId != null && attrId.getAttrGroupId()!=null) {
AttrGroupEntity attrGroupEntity = attrGroupDao.selectById(attrId.getAttrGroupId());
attrResponseVo.setGroupName(attrGroupEntity.getAttrGroupName());
}

Loading…
Cancel
Save