From 2da7d51eebedc87b93831056ceeb319aee8fee10 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 10 Aug 2021 16:10:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8hutool=E5=88=A4=E6=96=ADs?= =?UTF-8?q?tring=E9=9D=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/system/token/ManagerTokenGenerate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index bcdbdb60..caf5598f 100644 --- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -1,5 +1,6 @@ package cn.lili.modules.system.token; +import cn.hutool.core.util.StrUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.security.AuthUser; @@ -77,7 +78,7 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { //循环权限菜单 userMenuVOList.forEach(menu -> { //循环菜单，赋予用户权限 - if (!menu.getPermission().isEmpty()) { + if (StrUtil.isNotEmpty(menu.getPermission())) { //获取路径集合 String[] permissionUrl = menu.getPermission().split(","); //for循环路径集合 From e2592a6c38899e99d7cc193e96adfacfb6b11e13 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 10 Aug 2021 16:42:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98=EF=BC=8C=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=8C=E6=AC=A1=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index a52ef85a..c98e13de 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -329,7 +329,7 @@ public class MemberServiceImpl extends ServiceImpl impleme checkMember(memberAddDTO.getUsername(), memberAddDTO.getMobile()); //添加会员 - Member member = new Member(memberAddDTO.getUsername(), memberAddDTO.getPassword(), memberAddDTO.getMobile()); + Member member = new Member(memberAddDTO.getUsername(), new BCryptPasswordEncoder().encode(memberAddDTO.getPassword()), memberAddDTO.getMobile()); this.save(member); String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); From 2f48def7342c8bdfb0edd61afb657cbc7114c1f6 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Tue, 10 Aug 2021 19:05:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/serviceimpl/DistributionCashServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 44125319..2f863b5a 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -137,7 +137,7 @@ public class DistributionCashServiceImpl extends ServiceImpl Date: Tue, 10 Aug 2021 19:21:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=80=BB=E8=8E=B7=E5=BE=97=E7=A7=AF=E5=88=86api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/PointsHistoryBuyerController.java | 8 +++++ .../service/MemberPointsHistoryService.java | 12 +++++-- .../MemberPointsHistoryServiceImpl.java | 32 +++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java index 8bc163f1..3f3a6d60 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java @@ -15,6 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -46,4 +47,11 @@ public class PointsHistoryBuyerController { public ResultMessage getMemberPointsHistoryVO() { return ResultUtil.data(memberPointsHistoryService.getMemberPointsHistoryVO(UserContext.getCurrentUser().getId())); } + + @ApiOperation(value = "修复会员总获得积分数据") + @PostMapping(value = "/repairPointData") + public ResultMessage repairPointData() { + return ResultUtil.data(memberPointsHistoryService.repairPointData()); + } + } diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java index ce523a6f..41edf1a5 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java @@ -24,11 +24,17 @@ public interface MemberPointsHistoryService extends IService MemberPointsHistoryList(PageVO page, String memberId, String memberName); + IPage MemberPointsHistoryList(PageVO page, String memberId, String memberName); + + /** + * 修复会员总积分数据 + */ + String repairPointData(); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index 1920c783..e92ccf85 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -3,6 +3,7 @@ package cn.lili.modules.member.serviceimpl; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.enums.PointTypeEnum; +import cn.lili.modules.member.mapper.MemberMapper; import cn.lili.modules.member.service.MemberService; import cn.lili.mybatis.util.PageUtil; import cn.lili.common.utils.StringUtils; @@ -12,11 +13,15 @@ import cn.lili.modules.member.entity.vo.MemberPointsHistoryVO; import cn.lili.modules.member.mapper.MemberPointsHistoryMapper; import cn.lili.modules.member.service.MemberPointsHistoryService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * 会员积分历史业务层实现 * @@ -30,6 +35,12 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl memberList = memberMapper.selectList(new QueryWrapper()); + for (Member member : memberList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("member_id", member.getId()); + queryWrapper.eq("point_type", PointTypeEnum.INCREASE.name()); + List memberPointsHistorys = memberPointsHistoryMapper.selectList(queryWrapper); + Long point = 0L; + if (memberPointsHistorys.size() > 0) { + for (MemberPointsHistory memberPointsHistory : memberPointsHistorys) { + point += memberPointsHistory.getVariablePoint(); + } + } + member.setTotalPoint(point); + memberMapper.updateById(member); + } + return "SUCCESS"; + } } \ No newline at end of file From 7b7bab44c7d744d2ad9abd1ab38e0e62a2a55180 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Tue, 10 Aug 2021 19:25:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/PointsHistoryBuyerController.java | 5 ---- .../service/MemberPointsHistoryService.java | 5 ---- .../MemberPointsHistoryServiceImpl.java | 26 ------------------- 3 files changed, 36 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java index 3f3a6d60..7924f3ee 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java @@ -48,10 +48,5 @@ public class PointsHistoryBuyerController { return ResultUtil.data(memberPointsHistoryService.getMemberPointsHistoryVO(UserContext.getCurrentUser().getId())); } - @ApiOperation(value = "修复会员总获得积分数据") - @PostMapping(value = "/repairPointData") - public ResultMessage repairPointData() { - return ResultUtil.data(memberPointsHistoryService.repairPointData()); - } } diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java index 41edf1a5..dec081bc 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java @@ -32,9 +32,4 @@ public interface MemberPointsHistoryService extends IService MemberPointsHistoryList(PageVO page, String memberId, String memberName); - /** - * 修复会员总积分数据 - */ - String repairPointData(); - } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index e92ccf85..6f6736da 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -35,12 +35,6 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl memberList = memberMapper.selectList(new QueryWrapper()); - for (Member member : memberList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("member_id", member.getId()); - queryWrapper.eq("point_type", PointTypeEnum.INCREASE.name()); - List memberPointsHistorys = memberPointsHistoryMapper.selectList(queryWrapper); - Long point = 0L; - if (memberPointsHistorys.size() > 0) { - for (MemberPointsHistory memberPointsHistory : memberPointsHistorys) { - point += memberPointsHistory.getVariablePoint(); - } - } - member.setTotalPoint(point); - memberMapper.updateById(member); - } - return "SUCCESS"; - } } \ No newline at end of file From fc76e74d34554764f44000f724b03aa05cee9425 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 11 Aug 2021 09:52:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=8B=BC=E5=9B=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/cart/service/CartServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index e36bb96b..6cf421e5 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -647,17 +647,16 @@ public class CartServiceImpl implements CartService { * @param num 数量 */ private void checkCart(CartTypeEnum cartTypeEnum, CartSkuVO cartSkuVO, String skuId, Integer num) { + + this.checkSetGoodsQuantity(cartSkuVO, skuId, num); //拼团判定 if (cartTypeEnum.equals(CartTypeEnum.PINTUAN)) { - checkPintuan(cartSkuVO); //砍价判定 + checkPintuan(cartSkuVO); } else if (cartTypeEnum.equals(CartTypeEnum.KANJIA)) { - checkKanjia(cartSkuVO); //检测购物车的数量 - } else { - this.checkSetGoodsQuantity(cartSkuVO, skuId, num); + checkKanjia(cartSkuVO); } - } /** @@ -695,7 +694,7 @@ public class CartServiceImpl implements CartService { private void checkKanjia(CartSkuVO cartSkuVO) { //根据skuId获取砍价商品 - KanjiaActivityGoodsDTO kanjiaActivityGoodsDTO=kanjiaActivityGoodsService.getKanjiaGoodsBySkuId(cartSkuVO.getGoodsSku().getId()); + KanjiaActivityGoodsDTO kanjiaActivityGoodsDTO = kanjiaActivityGoodsService.getKanjiaGoodsBySkuId(cartSkuVO.getGoodsSku().getId()); //查找当前会员的砍价商品活动 KanjiaActivitySearchParams kanjiaActivitySearchParams = new KanjiaActivitySearchParams(); From 6464d68133fd64f560c1613bb67b249b9ce53973 Mon Sep 17 00:00:00 2001 From: chopper711 <1814994716@qq.com> Date: Wed, 11 Aug 2021 03:12:04 +0000 Subject: [PATCH 7/7] =?UTF-8?q?update=20framework/src/main/java/cn/lili/mo?= =?UTF-8?q?dules/system/token/ManagerTokenGenerate.java.=20=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=9D=83=E9=99=90=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/system/token/ManagerTokenGenerate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index caf5598f..5c112d99 100644 --- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -99,8 +99,8 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { } } } - //去除无效的权限 - superPermissions.forEach(queryPermissions::remove); + //去除重复的权限 + queryPermissions.removeAll(superPermissions); }); permission.put(PermissionEnum.SUPER.name(), superPermissions); permission.put(PermissionEnum.QUERY.name(), queryPermissions);