Administrator
2025-05-22 9bb4c9aeeb6165c08e6be165640f177f2c193627
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -73,16 +73,24 @@
            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("固定邮费不能小于零");
        if (addMallGoodsDto.getIsNormal() == 3) {
            String storeAppId = addMallGoodsDto.getStoreAppId();
            if (ObjectUtil.isEmpty(storeAppId)) {
                return new FebsResponse().fail().message("微信小店APP_ID不能为空");
            }
        }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,10 +132,14 @@
                    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())) {
                        return new FebsResponse().fail().message("佣金不能为空");
                    }
                    BigDecimal costPrice = addSku.getCostPrice();
                    BigDecimal levelOnePrice = new BigDecimal(addSku.getLevelOnePrice());
                    if (levelOnePrice.compareTo(costPrice) >= 0) {
                        return new FebsResponse().fail().message("佣金要小于成本价");
                    }
                    BigDecimal goodsWeight = addSku.getGoodsWeight();
                    if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
@@ -199,8 +211,8 @@
            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.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
//            sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
            sku.setSkuVolume(mallGoods.getVolume());
            sku.setStock(mallGoods.getStock());
            sku.setStyleId(style.getId());
@@ -237,12 +249,11 @@
                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.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.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));
//                mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice()));
                mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
                mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -365,6 +376,14 @@
            }
        }
        if (mallGoodsUpdateDto.getIsNormal() == 3) {
            String storeAppId = mallGoodsUpdateDto.getStoreAppId();
            if (ObjectUtil.isEmpty(storeAppId)) {
                return new FebsResponse().fail().message("微信小店APP_ID不能为空");
            }
        }
        if (mallGoodsUpdateDto.getGoodsType() != 2) {
            Long categoryId = mallGoodsUpdateDto.getCategoryId();
            if (ObjectUtil.isEmpty(categoryId)) {
@@ -400,6 +419,15 @@
                    BigDecimal presentPrice = addSku.getPresentPrice();
                    if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
                        return new FebsResponse().fail().message("商品规格现价不能小于0");
                    }
                    if (ObjectUtil.isEmpty(addSku.getLevelOnePrice())) {
                        return new FebsResponse().fail().message("佣金不能为空");
                    }
                    BigDecimal costPrice = addSku.getCostPrice();
                    BigDecimal levelOnePrice = addSku.getLevelOnePrice();
                    if (levelOnePrice.compareTo(costPrice) >= 0) {
                        return new FebsResponse().fail().message("佣金要小于成本价");
                    }
                    BigDecimal goodsWeight = addSku.getGoodsWeight();
                    if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
@@ -486,9 +514,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(mallGoods.getLevelOnePrice());
//            sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
//            sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
            sku.setSkuVolume(mallGoods.getVolume());
            sku.setStock(mallGoods.getStock());
            sku.setStyleId(style.getId());
@@ -552,11 +580,11 @@
                        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.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
//                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
//                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
//                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
                        mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
                        mallGoodsSku.setGoodsId(mallGoods.getId());
                        mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
@@ -572,11 +600,11 @@
                        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.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
//                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
//                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
//                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
                        mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
                        mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                        mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -864,7 +892,7 @@
        mallGoodsCoupon.setName(name);
        mallGoodsCoupon.setExpireDay(couponRuleAddDto.getExpireDay());
        mallGoodsCoupon.setCostAmount(couponRuleAddDto.getCostAmount());
        mallGoodsCoupon.setType(MallGoodsCoupon.TYPE_ONE);
        mallGoodsCoupon.setType(couponRuleAddDto.getType());
        mallGoodsCoupon.setRealAmount(couponRuleAddDto.getRealAmount());
        mallGoodsCouponMapper.insert(mallGoodsCoupon);
@@ -947,6 +975,7 @@
        mallGoodsCoupon.setName(adminMallGoodsCouponVo.getName());
        mallGoodsCoupon.setExpireDay(adminMallGoodsCouponVo.getExpireDay());
        mallGoodsCoupon.setCostAmount(adminMallGoodsCouponVo.getCostAmount());
        mallGoodsCoupon.setType(adminMallGoodsCouponVo.getType());
        mallGoodsCoupon.setRealAmount(adminMallGoodsCouponVo.getRealAmount());
        mallGoodsCouponMapper.updateById(mallGoodsCoupon);