From ed976e90dcaedd55321a6f01aaa0c8ac4aaaeba9 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 27 Jul 2022 17:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=83=E9=94=80=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=95=86=E5=93=81=EF=BC=8C=E6=A3=80=E6=9F=A5=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E4=BF=83=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/service/GoodsSkuService.java | 10 ++++- .../serviceimpl/GoodsSkuServiceImpl.java | 10 +++++ .../member/serviceimpl/MemberServiceImpl.java | 1 - .../serviceimpl/CouponServiceImpl.java | 2 +- .../KanjiaActivityGoodsServiceImpl.java | 6 +-- .../KanjiaActivityServiceImpl.java | 2 +- .../serviceimpl/PintuanServiceImpl.java | 2 +- .../serviceimpl/PointsGoodsServiceImpl.java | 2 +- .../PromotionGoodsServiceImpl.java | 39 +------------------ .../serviceimpl/SeckillApplyServiceImpl.java | 6 +-- 10 files changed, 30 insertions(+), 50 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java index 8a322a79..a78f9bb0 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java @@ -82,6 +82,14 @@ public interface GoodsSkuService extends IService { */ GoodsSku getGoodsSkuByIdFromCache(String id); + /** + * 从缓存中获取可参与促销商品 + * + * @param skuId skuid + * @return 商品详情 + */ + GoodsSku getCanPromotionGoodsSkuByIdFromCache(String skuId); + /** * 获取商品sku详情 * @@ -143,7 +151,7 @@ public interface GoodsSkuService extends IService { /** * 分页查询商品sku信息 * - * @param page 分页参数 + * @param page 分页参数 * @param queryWrapper 查询参数 * @return 商品sku信息 */ diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 5ab87344..5438ae95 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -22,6 +22,7 @@ import cn.lili.modules.goods.entity.dto.GoodsSearchParams; import cn.lili.modules.goods.entity.dto.GoodsSkuDTO; import cn.lili.modules.goods.entity.dto.GoodsSkuStockDTO; import cn.lili.modules.goods.entity.enums.GoodsAuthEnum; +import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; import cn.lili.modules.goods.entity.vos.GoodsSkuSpecVO; import cn.lili.modules.goods.entity.vos.GoodsSkuVO; @@ -237,6 +238,15 @@ public class GoodsSkuServiceImpl extends ServiceImpl i return goodsSku; } + @Override + public GoodsSku getCanPromotionGoodsSkuByIdFromCache(String skuId) { + GoodsSku goodsSku = this.getGoodsSkuByIdFromCache(skuId); + if (goodsSku != null && GoodsSalesModeEnum.WHOLESALE.name().equals(goodsSku.getSalesModel())) { + throw new ServiceException(ResultCode.PROMOTION_GOODS_DO_NOT_JOIN_WHOLESALE, goodsSku.getGoodsName()); + } + return goodsSku; + } + @Override public Map getGoodsSkuDetail(String goodsId, String skuId) { Map map = new HashMap<>(16); 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 a26632cf..86031a0c 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 @@ -462,7 +462,6 @@ public class MemberServiceImpl extends ServiceImpl impleme memberPointMessage.setPoint(point); memberPointMessage.setType(type); memberPointMessage.setMemberId(memberId); - // 发送会员注册信息 applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("update member point", rocketmqCustomProperties.getMemberTopic(), MemberTagsEnum.MEMBER_POINT_CHANGE.name(), memberPointMessage)); return true; } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index 4f08616f..167fd2eb 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java @@ -291,7 +291,7 @@ public class CouponServiceImpl extends AbstractPromotionsServiceImpl promotionGoods = PromotionTools.promotionGoodsInit(pintuan.getPromotionGoodsList(), pintuan, PromotionTypeEnum.PINTUAN); for (PromotionGoods promotionGood : promotionGoods) { - if (goodsSkuService.getGoodsSkuByIdFromCache(promotionGood.getSkuId()) == null) { + if (goodsSkuService.getCanPromotionGoodsSkuByIdFromCache(promotionGood.getSkuId()) == null) { log.error("商品[" + promotionGood.getGoodsName() + "]不存在或处于不可售卖状态！"); throw new ServiceException("商品[" + promotionGood.getGoodsName() + "]不存在或处于不可售卖状态！"); } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java index 95f37f19..2be950f4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java @@ -278,7 +278,7 @@ public class PointsGoodsServiceImpl extends AbstractPromotionsServiceImpl findSkuValidPromotion(String skuId, String storeIds) { - GoodsSku sku = goodsSkuService.getGoodsSkuByIdFromCache(skuId); + GoodsSku sku = goodsSkuService.getCanPromotionGoodsSkuByIdFromCache(skuId); if (sku == null) { return new ArrayList<>(); } @@ -316,40 +313,6 @@ public class PromotionGoodsServiceImpl extends ServiceImpl entityList) { - for (PromotionGoods promotionGoods : entityList) { - this.checkGoodsSku(promotionGoods.getSkuId()); - } - return super.saveBatch(entityList); - } - - @Override - public boolean saveOrUpdateBatch(Collection entityList) { - for (PromotionGoods promotionGoods : entityList) { - this.checkGoodsSku(promotionGoods.getSkuId()); - } - return super.saveOrUpdateBatch(entityList); - } - - /** - * 检查是否为不能参加促销活动的商品 - * - * @param skuId 商品skuId - */ - private void checkGoodsSku(String skuId) { - GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(skuId); - if (goodsSku != null && GoodsSalesModeEnum.WHOLESALE.name().equals(goodsSku.getSalesModel())) { - throw new ServiceException(ResultCode.PROMOTION_GOODS_DO_NOT_JOIN_WHOLESALE, goodsSku.getGoodsName()); - } - } - private void setGoodsPromotionInfo(GoodsSku dataSku, Map.Entry promotionInfo) { JSONObject promotionsObj = JSONUtil.parseObj(promotionInfo.getValue()); PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams(); diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java index 07572e9c..6d5eaec9 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java @@ -161,7 +161,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl promotionGoodsList = new ArrayList<>(); for (SeckillApplyVO seckillApply : seckillApplyList) { //获取参与活动的商品信息 - GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(seckillApply.getSkuId()); + GoodsSku goodsSku = goodsSkuService.getCanPromotionGoodsSkuByIdFromCache(seckillApply.getSkuId()); if (!goodsSku.getStoreId().equals(storeId)) { continue; } @@ -262,7 +262,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl list = this.list(queryWrapper).stream().filter(i -> i.getTimeLine() != null && seckill.getHours().contains(i.getTimeLine().toString())).collect(Collectors.toList()); for (SeckillApply seckillApply : list) { //获取参与活动的商品信息 - GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(seckillApply.getSkuId()); + GoodsSku goodsSku = goodsSkuService.getCanPromotionGoodsSkuByIdFromCache(seckillApply.getSkuId()); //获取促销商品 PromotionGoods promotionGoods = this.setSeckillGoods(goodsSku, seckillApply, seckill); promotionGoodsList.add(promotionGoods); @@ -373,7 +373,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl collect = seckillApplyList.stream().filter(i -> i.getTimeLine().equals(startTimeline) && i.getPromotionApplyStatus().equals(PromotionsApplyStatusEnum.PASS.name())).collect(Collectors.toList()); for (SeckillApply seckillApply : collect) { - GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(seckillApply.getSkuId()); + GoodsSku goodsSku = goodsSkuService.getCanPromotionGoodsSkuByIdFromCache(seckillApply.getSkuId()); if (goodsSku != null) { SeckillGoodsVO goodsVO = new SeckillGoodsVO(); BeanUtil.copyProperties(seckillApply, goodsVO);