From 5c8f31451f505429a023cc2786273d12024cffe3 Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Sat, 03 Jun 2023 03:26:25 +0800 Subject: [PATCH] fix --- src/main/resources/templates/febs/views/modules/score/goodsList.html | 25 ++++++------------------- src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 3 ++- src/main/resources/templates/febs/views/modules/goods/goodsList.html | 22 ++++++---------------- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +- 4 files changed, 15 insertions(+), 37 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java index 94bc96f..e901712 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java @@ -163,7 +163,7 @@ MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd); if (mallMember == null) { - throw new FebsException("用户不存在或账号密码错误"); + throw new FebsException("账号密码错误"); } if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) { diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java index 58c26a4..e6ff8d5 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java @@ -430,7 +430,8 @@ int totalScore = hasSignTotalList.stream().mapToInt(MallScoreSignRecord::getScore).sum(); if (totalScore + mallScoreSignRecord.getScore() > scoreSetting.getMostSignIn()) { - throw new FebsException("达到当月积分上限"); +// throw new FebsException("达到当月积分上限"); + mallScoreSignRecord.setScore(scoreSetting.getMostSignIn() - totalScore); } } diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html index 74ae8f3..0a5081c 100644 --- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html +++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html @@ -16,7 +16,7 @@ </div> </div> <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area"> - <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add"> + <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add" shiro:hasPermission="goodsUpdateNew:update"> 新增 </div> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query"> @@ -48,11 +48,10 @@ </div> <!-- 表格操作栏 start --> <script type="text/html" id="user-option"> - <span shiro:lacksPermission="user:view,user:update,user:delete"> - <span class="layui-badge-dot febs-bg-orange"></span> 无权限 - </span> - <a lay-event="edit" shiro:hasPermission="goodsUpdateNew:update"><i - class="layui-icon febs-edit-area febs-blue"></i></a> + {{# if(d.isSale != 1) { }} + <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="goodsUpdateNew:update">编辑</button> + <button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="goodsUpdateNew:update">删除</button> + {{# } }} </script> <script type="text/html" id="upOrDownSwitch"> {{# if(d.isSale === 1) { }} @@ -243,16 +242,7 @@ {field: 'stock', title: '商品库存', minWidth: 100,align:'left'}, {field: 'skuVolume', title: '商品销量', minWidth: 100,align:'left'}, {field: 'scorePercent', title: '兑换比例', minWidth: 100,align:'left'}, - {title: '操作', - templet: function (d) { - if (d.isSale === 1) { - return ''; - }else{ - return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="goodsUpdateNew:update">编辑</button>' - + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="goodsUpdateNew:update">删除</button>' - - } - },minWidth: 160,align:'center'} + {title: '操作', templet: "#user-option",minWidth: 160,align:'center'} ]] }); } diff --git a/src/main/resources/templates/febs/views/modules/score/goodsList.html b/src/main/resources/templates/febs/views/modules/score/goodsList.html index d372298..b794154 100644 --- a/src/main/resources/templates/febs/views/modules/score/goodsList.html +++ b/src/main/resources/templates/febs/views/modules/score/goodsList.html @@ -15,7 +15,7 @@ </div> </div> <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area"> - <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add"> + <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add" shiro:hasPermission="goodsAddNew:add"> 新增 </div> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query"> @@ -47,11 +47,10 @@ </div> <!-- 表格操作栏 start --> <script type="text/html" id="user-option"> - <span shiro:lacksPermission="user:view,user:update,user:delete"> - <span class="layui-badge-dot febs-bg-orange"></span> 无权限 - </span> - <a lay-event="edit" shiro:hasPermission="user:update"><i - class="layui-icon febs-edit-area febs-blue"></i></a> + {{# if(d.isSale != 1) { }} + <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="goodsAddNew:add">编辑</button> + <button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="goodsAddNew:add">删除</button> + {{# } }} </script> <script type="text/html" id="upOrDownSwitch"> {{# if(d.isSale === 1) { }} @@ -201,19 +200,7 @@ {field: 'originalPrice', title: '原价', minWidth: 150,align:'left'}, {field: 'stock', title: '商品库存', minWidth: 150,align:'left'}, {field: 'skuVolume', title: '商品销量', minWidth: 150,align:'left'}, - {title: '操作', - templet: function (d) { - if (d.isSale === 1) { - return ''; - // return '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-orange" lay-event="downGoods" shiro:hasPermission="user:update">下架</button>' - // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detailGoods" shiro:hasPermission="user:update">详情</button>' - }else{ - return '' // '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-green" lay-event="upGoods" shiro:hasPermission="user:update">上架</button>' - + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="user:update">编辑</button>' - + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="user:update">删除</button>' - - } - },minWidth: 160,align:'center'} + {title: '操作', templet: "#user-option",minWidth: 160,align:'center'} ]] }); } -- Gitblit v1.9.1