perf(mall): 移除会员利润计算中的异步执行

KKSU

2025-03-18 664184af3e070dee665ee736caffa0297804975f

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java

@@ -2,7 +2,6 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -73,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("邮费模板不能为空");
                }
            }
        }

@@ -124,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("重量不能小于零");
@@ -196,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());
@@ -237,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());
@@ -486,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());
@@ -552,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);
@@ -572,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());