From 664184af3e070dee665ee736caffa0297804975f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 18 Mar 2025 11:46:02 +0800 Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 306 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 265 insertions(+), 41 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java index 218b441..10cd251 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java @@ -42,6 +42,8 @@ private final MallShoppingCartMapper mallShoppingCartMapper; private final MallCarriageRuleMapper mallCarriageRuleMapper; private final MallCarriageRuleInfoMapper mallCarriageRuleInfoMapper; + private final MallGoodsCouponMapper mallGoodsCouponMapper; + private final CouponGoodsMapper couponGoodsMapper; @Override public IPage<AdminMallGoodsVo> getCategoryListInPage(MallGoods mallGoods, QueryRequest request) { @@ -70,16 +72,18 @@ return new FebsResponse().fail().message("商品编号不能重复"); } Integer carriageType = addMallGoodsDto.getCarriageType(); - if(1 == carriageType){ - if(ObjectUtil.isEmpty(addMallGoodsDto.getCarriageAmount()) - || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) > 0){ - return new FebsResponse().fail().message("固定邮费不能小于零"); - } - }else{ - Long carriageRuleId = addMallGoodsDto.getCarriageRuleId(); - MallCarriageRule mallCarriageRule = mallCarriageRuleMapper.selectById(carriageRuleId); - if(ObjectUtil.isEmpty(mallCarriageRule)){ - return new FebsResponse().fail().message("邮费模板不能为空"); + if (addMallGoodsDto.getGoodsType() == 1) { + if (1 == carriageType) { + if (ObjectUtil.isEmpty(addMallGoodsDto.getCarriageAmount()) + || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) > 0) { + return new FebsResponse().fail().message("固定邮费不能小于零"); + } + } else { + Long carriageRuleId = addMallGoodsDto.getCarriageRuleId(); + MallCarriageRule mallCarriageRule = mallCarriageRuleMapper.selectById(carriageRuleId); + if (ObjectUtil.isEmpty(mallCarriageRule)) { + return new FebsResponse().fail().message("邮费模板不能为空"); + } } } @@ -121,11 +125,11 @@ if (StrUtil.isEmpty(presentPrice)) { return new FebsResponse().fail().message("商品规格现价不能为空"); } - if (StrUtil.isEmpty(addSku.getLevelOnePrice()) - || StrUtil.isEmpty(addSku.getLevelTwoPrice()) - || StrUtil.isEmpty(addSku.getLevelThreePrice())) { - return new FebsResponse().fail().message("商品规格级别价格不能为空"); - } +// if (StrUtil.isEmpty(addSku.getLevelOnePrice()) +// || StrUtil.isEmpty(addSku.getLevelTwoPrice()) +// || StrUtil.isEmpty(addSku.getLevelThreePrice())) { +// return new FebsResponse().fail().message("商品规格级别价格不能为空"); +// } BigDecimal goodsWeight = addSku.getGoodsWeight(); if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){ return new FebsResponse().fail().message("重量不能小于零"); @@ -158,6 +162,25 @@ } } + Long goodsId = mallGoods.getId(); + QueryWrapper<CouponGoods> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("goods_id",goodsId); + List<CouponGoods> mallGoodsCoupons = couponGoodsMapper.selectList(objectQueryWrapper); + if(CollUtil.isNotEmpty(mallGoodsCoupons)){ + for(CouponGoods couponGoods : mallGoodsCoupons){ + couponGoodsMapper.deleteById(couponGoods); + } + } + if(CollUtil.isNotEmpty(addMallGoodsDto.getCouponIds())){ + List<Long> couponIds = addMallGoodsDto.getCouponIds(); + for(Long couponId : couponIds){ + CouponGoods couponGoods = new CouponGoods(); + couponGoods.setGoodsId(goodsId); + couponGoods.setCouponId(couponId); + couponGoodsMapper.insert(couponGoods); + } + } + if (addMallGoodsDto.getGoodsType() == 2) { return new FebsResponse().success().message("添加成功"); } @@ -174,11 +197,11 @@ sku.setSkuImage(mallGoods.getThumb()); sku.setSkuName(mallGoods.getGoodsName()); sku.setCostPrice(mallGoods.getCostPrice()); - sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice())); - sku.setLevelOnePrice(mallGoods.getLevelOnePrice()); - sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice()); - sku.setLevelThreePrice(mallGoods.getLevelThreePrice()); + sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); + sku.setLevelOnePrice(new BigDecimal(mallGoods.getPresentPrice())); + sku.setLevelTwoPrice(new BigDecimal(mallGoods.getPresentPrice())); + sku.setLevelThreePrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setSkuVolume(mallGoods.getVolume()); sku.setStock(mallGoods.getStock()); sku.setStyleId(style.getId()); @@ -215,14 +238,13 @@ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock()); mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume()); mallGoodsSku.setOriginalPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice())); -// mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); - mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice())); - - mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getLevelOnePrice())); - mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice())); - mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice())); - mallGoodsSku.setStyleId(mallGoodsStyleSku.getId()); + mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); + + mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); + mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); + mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); + mallGoodsSku.setStyleId(mallGoodsStyleSku.getId()); mallGoodsSku.setGoodsId(mallGoods.getId()); mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight()); mallGoodsSku.setSample(addMallGoodsSkuDto.getSample()); @@ -303,8 +325,10 @@ List<MallGoodsSku> skus = mallGoodsSkuMapper.selectSkuByGoodsId(mallGoods.getId()); List<String> thumbs = mallGoodsImagesMapper.selectByGoodId(mallGoods.getId()); + List<Long> couponIds = couponGoodsMapper.selectByGoodId(mallGoods.getId()); mallGoods.setImages(thumbs); mallGoods.setSkus(skus); + mallGoods.setCouponIds(couponIds); return mallGoods; } @@ -425,6 +449,25 @@ } } + Long goodsId = mallGoodsUpdateDto.getId(); + QueryWrapper<CouponGoods> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("goods_id",goodsId); + List<CouponGoods> mallGoodsCoupons = couponGoodsMapper.selectList(objectQueryWrapper); + if(CollUtil.isNotEmpty(mallGoodsCoupons)){ + for(CouponGoods couponGoods : mallGoodsCoupons){ + couponGoodsMapper.deleteById(couponGoods); + } + } + if(CollUtil.isNotEmpty(mallGoodsUpdateDto.getCouponIds())){ + List<Long> couponIds = mallGoodsUpdateDto.getCouponIds(); + for(Long couponId : couponIds){ + CouponGoods couponGoods = new CouponGoods(); + couponGoods.setGoodsId(goodsId); + couponGoods.setCouponId(couponId); + couponGoodsMapper.insert(couponGoods); + } + } + if (mallGoodsUpdateDto.getGoodsType() == 2) { return new FebsResponse().success().message("编辑成功"); } @@ -443,9 +486,9 @@ sku.setCostPrice(mallGoods.getCostPrice()); sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice())); - sku.setLevelOnePrice(mallGoods.getLevelOnePrice()); - sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice()); - sku.setLevelThreePrice(mallGoods.getLevelThreePrice()); + sku.setLevelOnePrice(new BigDecimal(mallGoods.getPresentPrice())); + sku.setLevelTwoPrice(new BigDecimal(mallGoods.getPresentPrice())); + sku.setLevelThreePrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setSkuVolume(mallGoods.getVolume()); sku.setStock(mallGoods.getStock()); sku.setStyleId(style.getId()); @@ -509,14 +552,13 @@ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock()); mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume()); mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice()); -// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); - mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice()); - mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice()); - mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice()); - mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice()); + mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); + mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); + mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getPresentPrice()); + mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getPresentPrice()); + mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getPresentPrice()); mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId()); mallGoodsSku.setGoodsId(mallGoods.getId()); - mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight()); mallGoodsSku.setSample(addMallGoodsSkuDto.getSample()); mallGoodsSkuMapper.updateById(mallGoodsSku); @@ -529,13 +571,12 @@ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock()); mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume()); mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice()); -// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); - mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice()); - mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice()); - mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice()); - mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice()); - mallGoodsSku.setStyleId(mallGoodsStyleSku.getId()); + mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); + mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getPresentPrice()); + mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getPresentPrice()); + mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getPresentPrice()); + mallGoodsSku.setStyleId(mallGoodsStyleSku.getId()); mallGoodsSku.setGoodsId(mallGoods.getId()); mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight()); mallGoodsSku.setSample(addMallGoodsSkuDto.getSample()); @@ -799,4 +840,187 @@ List<MallCarriageRule> mallCarriageRules = mallCarriageRuleMapper.selectList(new QueryWrapper<>()); return mallCarriageRules; } + + @Override + public IPage<MallGoodsCoupon> getMallGoodsCouponListInPage(MallGoodsCoupon mallGoodsCoupon, QueryRequest request) { + Page<MallGoodsCoupon> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<MallGoodsCoupon> mallGoodsCouponIPage = mallGoodsCouponMapper.selectMallGoodsCouponListInPage(page, mallGoodsCoupon); + return mallGoodsCouponIPage; + } + + @Override + public FebsResponse couponRuleAdd(CouponRuleAddDto couponRuleAddDto) { + String name = couponRuleAddDto.getName(); + QueryWrapper<MallGoodsCoupon> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("name",name); + List<MallGoodsCoupon> mallGoodsCoupons = mallGoodsCouponMapper.selectList(objectQueryWrapper); + if(CollUtil.isNotEmpty(mallGoodsCoupons)){ + return new FebsResponse().fail().message("名称不能重复"); + } + + MallGoodsCoupon mallGoodsCoupon = new MallGoodsCoupon(); + mallGoodsCoupon.setName(name); + mallGoodsCoupon.setExpireDay(couponRuleAddDto.getExpireDay()); + mallGoodsCoupon.setCostAmount(couponRuleAddDto.getCostAmount()); + mallGoodsCoupon.setType(couponRuleAddDto.getType()); + mallGoodsCoupon.setRealAmount(couponRuleAddDto.getRealAmount()); + mallGoodsCouponMapper.insert(mallGoodsCoupon); + + Long couponId = mallGoodsCoupon.getId(); + QueryWrapper<CouponGoods> objectQueryWrapperCoupon = new QueryWrapper<>(); + objectQueryWrapperCoupon.eq("coupon_id",couponId); + List<CouponGoods> couponGoodsList = couponGoodsMapper.selectList(objectQueryWrapperCoupon); + if(CollUtil.isNotEmpty(couponGoodsList)){ + for(CouponGoods couponGoods : couponGoodsList){ + couponGoodsMapper.deleteById(couponGoods); + } + } + if(CollUtil.isNotEmpty(couponRuleAddDto.getGoodsIds())){ + List<Long> goodsIds = couponRuleAddDto.getGoodsIds(); + for(Long goodsId : goodsIds){ + CouponGoods couponGoods = new CouponGoods(); + couponGoods.setGoodsId(goodsId); + couponGoods.setCouponId(couponId); + couponGoodsMapper.insert(couponGoods); + } + } + return new FebsResponse().success().message("操作成功"); + } + + @Override + public FebsResponse couponRuleDel(Long id) { + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(id); + if (ObjectUtil.isEmpty(mallGoodsCoupon)) { + return new FebsResponse().fail().message("优惠卷不存在,请刷新当前页面"); + } + Integer state = mallGoodsCoupon.getState(); + if(2 == state){ + return new FebsResponse().fail().message("请先下架优惠卷"); + } + mallGoodsCouponMapper.deleteById(id); + return new FebsResponse().success(); + } + + @Override + public FebsResponse upCoupon(Long id) { + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(id); + if (ObjectUtil.isEmpty(mallGoodsCoupon)) { + return new FebsResponse().fail().message("优惠卷不存在,请刷新当前页面"); + } + mallGoodsCoupon.setState(2); + mallGoodsCouponMapper.updateById(mallGoodsCoupon); + return new FebsResponse().success(); + } + + @Override + public FebsResponse downCoupon(Long id) { + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(id); + if (ObjectUtil.isEmpty(mallGoodsCoupon)) { + return new FebsResponse().fail().message("优惠卷不存在,请刷新当前页面"); + } + mallGoodsCoupon.setState(1); + mallGoodsCouponMapper.updateById(mallGoodsCoupon); + return new FebsResponse().success().message("操作成功"); + } + + @Override + public AdminMallGoodsCouponVo selectGoodsCouponById(long id) { + List<Long> goodsIds = couponGoodsMapper.selectByCouponId(id); + AdminMallGoodsCouponVo adminMallGoodsCouponVo = mallGoodsCouponMapper.selectGoodsCouponById(id); + adminMallGoodsCouponVo.setGoodsIds(goodsIds); + return adminMallGoodsCouponVo; + } + + @Override + public FebsResponse couponUpdate(AdminMallGoodsCouponVo adminMallGoodsCouponVo) { + Long id = adminMallGoodsCouponVo.getId(); + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(id); + if (ObjectUtil.isEmpty(mallGoodsCoupon)) { + return new FebsResponse().fail().message("优惠卷不存在,请刷新当前页面"); + } + Integer state = mallGoodsCoupon.getState(); + if(2 == state){ + return new FebsResponse().fail().message("请先下架优惠卷"); + } + mallGoodsCoupon.setName(adminMallGoodsCouponVo.getName()); + mallGoodsCoupon.setExpireDay(adminMallGoodsCouponVo.getExpireDay()); + mallGoodsCoupon.setCostAmount(adminMallGoodsCouponVo.getCostAmount()); + mallGoodsCoupon.setType(adminMallGoodsCouponVo.getType()); + mallGoodsCoupon.setRealAmount(adminMallGoodsCouponVo.getRealAmount()); + mallGoodsCouponMapper.updateById(mallGoodsCoupon); + + Long couponId = mallGoodsCoupon.getId(); + QueryWrapper<CouponGoods> objectQueryWrapperCoupon = new QueryWrapper<>(); + objectQueryWrapperCoupon.eq("coupon_id",couponId); + List<CouponGoods> couponGoodsList = couponGoodsMapper.selectList(objectQueryWrapperCoupon); + if(CollUtil.isNotEmpty(couponGoodsList)){ + for(CouponGoods couponGoods : couponGoodsList){ + couponGoodsMapper.deleteById(couponGoods); + } + } + if(CollUtil.isNotEmpty(adminMallGoodsCouponVo.getGoodsIds())){ + List<Long> goodsIds = adminMallGoodsCouponVo.getGoodsIds(); + for(Long goodsId : goodsIds){ + CouponGoods couponGoods = new CouponGoods(); + couponGoods.setGoodsId(goodsId); + couponGoods.setCouponId(couponId); + couponGoodsMapper.insert(couponGoods); + } + } + return new FebsResponse().success().message("操作成功"); + } + + @Override + public List<AdminMallGoodsCouponTreeVo> findAdminMallGoodsCouponVoTree() { + QueryWrapper<MallGoodsCoupon> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("state",2); + List<MallGoodsCoupon> mallGoodsCoupons = mallGoodsCouponMapper.selectList(objectQueryWrapper); + + List<AdminMallGoodsCouponTreeVo> objects = new ArrayList<>(); + if(CollUtil.isNotEmpty(mallGoodsCoupons)){ + for(MallGoodsCoupon mallGoodsCoupon : mallGoodsCoupons){ + AdminMallGoodsCouponTreeVo adminMallGoodsCouponTreeVo = new AdminMallGoodsCouponTreeVo(); + adminMallGoodsCouponTreeVo.setCouponId(mallGoodsCoupon.getId()); + adminMallGoodsCouponTreeVo.setCouponName(mallGoodsCoupon.getName()); + objects.add(adminMallGoodsCouponTreeVo); + } + } + return objects; + } + + @Override + public List<AdminMallGoodsCouponTreeListVo> findAdminMallGoodsCouponVoTreeList() { + QueryWrapper<MallGoodsCoupon> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("state",2); + List<MallGoodsCoupon> mallGoodsCoupons = mallGoodsCouponMapper.selectList(objectQueryWrapper); + + List<AdminMallGoodsCouponTreeListVo> objects = new ArrayList<>(); + if(CollUtil.isNotEmpty(mallGoodsCoupons)){ + for(MallGoodsCoupon mallGoodsCoupon : mallGoodsCoupons){ + AdminMallGoodsCouponTreeListVo adminMallGoodsCouponTreeListVo = new AdminMallGoodsCouponTreeListVo(); + adminMallGoodsCouponTreeListVo.setId(mallGoodsCoupon.getId()); + adminMallGoodsCouponTreeListVo.setName(mallGoodsCoupon.getName()); + objects.add(adminMallGoodsCouponTreeListVo); + } + } + return objects; + } + + @Override + public List<AdminMallGoodsCouponTreeListVo> findAdminMallGoodsVoTreeList() { + QueryWrapper<MallGoods> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("is_sale",1); + List<MallGoods> mallGoodsList = mallGoodsMapper.selectList(objectQueryWrapper); + + List<AdminMallGoodsCouponTreeListVo> objects = new ArrayList<>(); + if(CollUtil.isNotEmpty(mallGoodsList)){ + for(MallGoods mallGoods : mallGoodsList){ + AdminMallGoodsCouponTreeListVo adminMallGoodsCouponTreeListVo = new AdminMallGoodsCouponTreeListVo(); + adminMallGoodsCouponTreeListVo.setId(mallGoods.getId()); + adminMallGoodsCouponTreeListVo.setName(mallGoods.getGoodsName()); + objects.add(adminMallGoodsCouponTreeListVo); + } + } + return objects; + } } -- Gitblit v1.9.1