Commit 1e2257b3 authored by 万成波's avatar 万成波

优化代码

parent 22a6c2f1
...@@ -17,10 +17,11 @@ ...@@ -17,10 +17,11 @@
</el-row> </el-row>
<el-table :data="tableList"> <el-table :data="tableList">
<el-table-column label="序号" width="55" type="index" align="center"></el-table-column> <el-table-column label="序号" width="55" type="index" align="center"></el-table-column>
<el-table-column label="姓名" prop="nickName" align="center"></el-table-column> <el-table-column label="用户姓名" prop="nickName" align="center"></el-table-column>
<el-table-column label="帐号" prop="userName" align="center"></el-table-column> <el-table-column label="用户名" prop="userName" align="center"></el-table-column>
<el-table-column label="部门" prop="deptName" align="center"></el-table-column> <el-table-column label="所在部门" prop="deptName" align="center"></el-table-column>
<el-table-column label="总积分" prop="accumulatedPoints" align="center"></el-table-column> <el-table-column label="会员等级" prop="gradeName" align="center"></el-table-column>
<el-table-column label="累计积分" prop="accumulatedPoints" align="center"></el-table-column>
<el-table-column label="可用积分" prop="currentPoints" align="center"></el-table-column> <el-table-column label="可用积分" prop="currentPoints" align="center"></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="{ row }"> <template #default="{ row }">
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-table-column label="排序" prop="sort" align="center"></el-table-column> <el-table-column label="排序" prop="sort" align="center"></el-table-column>
<el-table-column label="是否初始等级" prop="sort" align="center"> <el-table-column label="是否初始等级" prop="sort" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-switch v-model="row.isInitial" active-text="是" inactive-text="否" :active-value="1" <el-switch v-model="row.isInitial" :active-value="1"
:inactive-value="0" @change="(val)=>handleUpdateInitial(val,row)"></el-switch> :inactive-value="0" @change="(val)=>handleUpdateInitial(val,row)"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -34,7 +34,6 @@ public class BbsPointsGoodsController extends BaseController { ...@@ -34,7 +34,6 @@ public class BbsPointsGoodsController extends BaseController {
* 查询积分商品列表 * 查询积分商品列表
*/ */
@ApiOperation("查询积分商品列表") @ApiOperation("查询积分商品列表")
@PreAuthorize("@ss.hasPermi('goods:goods:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(BbsPointsGoods bbsPointsGoods) { public TableDataInfo list(BbsPointsGoods bbsPointsGoods) {
startPage(); startPage();
......
...@@ -42,7 +42,6 @@ public class BbsUserPointsController extends BaseController { ...@@ -42,7 +42,6 @@ public class BbsUserPointsController extends BaseController {
* 查询用户积分列表 * 查询用户积分列表
*/ */
@ApiOperation("查询用户积分列表") @ApiOperation("查询用户积分列表")
@PreAuthorize("@ss.hasPermi('points:points:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(BbsUserPoints points) { public TableDataInfo list(BbsUserPoints points) {
startPage(); startPage();
......
...@@ -36,26 +36,6 @@ public class BbsUserPointsExchangeController extends BaseController { ...@@ -36,26 +36,6 @@ public class BbsUserPointsExchangeController extends BaseController {
@Resource @Resource
private IBbsUserPointsExchangeService bbsUserPointsExchangeService; private IBbsUserPointsExchangeService bbsUserPointsExchangeService;
@Resource
private IBbsPointsGoodsService pointsGoodsService;
/**
* 查询兑换商品
*/
@ApiOperation("查询兑换人")
@PreAuthorize("@ss.hasPermi('points:points:list')")
@GetMapping("/select/goods")
public AjaxResult selectGoods(String keyword) {
LambdaQueryWrapper<BbsPointsGoods> wrapper = new LambdaQueryWrapper<>();
wrapper.like(StrUtil.isNotBlank(keyword), BbsPointsGoods::getName, keyword);
wrapper.or();
wrapper.like(StrUtil.isNotBlank(keyword), BbsPointsGoods::getCode, keyword);
wrapper.orderByDesc(BbsPointsGoods::getCreateTime);
List<BbsPointsGoods> goods = this.pointsGoodsService.list(wrapper);
return AjaxResult.success(goods);
}
/** /**
* 查询用户积分兑换列表 * 查询用户积分兑换列表
......
...@@ -22,9 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -22,9 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT (SELECT name FROM bbs_grade WHERE is_initial = 1 ORDER BY create_time DESC LIMIT 1) AS name SELECT (SELECT name FROM bbs_grade WHERE is_initial = 1 ORDER BY create_time DESC LIMIT 1) AS name
) ug ) ug
<where> <where>
<if test="points.keyword != null and points.keyword != ''">
uv.nick_name LIKE CONCAT('%', #{points.keyword}, '%') OR uv.user_name LIKE CONCAT('%', #{points.keyword}, '%')
</if>
<if test="points.nickName != null and points.nickName != ''"> <if test="points.nickName != null and points.nickName != ''">
AND uv.nick_name LIKE CONCAT('%', #{points.nickName}, '%') AND uv.nick_name LIKE CONCAT('%', #{points.nickName}, '%')
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment