From f3f055971f1f0a56ff7a2e060fb154d33a7dee9e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Feb 2023 17:22:54 +0800
Subject: [PATCH] ali短信服务

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 9a89674..94b3d3e 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
@@ -72,7 +72,7 @@
         Integer carriageType = addMallGoodsDto.getCarriageType();
         if(1 == carriageType){
             if(ObjectUtil.isEmpty(addMallGoodsDto.getCarriageAmount())
-                    || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) >= 0){
+                    || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) > 0){
                 return new FebsResponse().fail().message("固定邮费不能小于零");
             }
         }else{
@@ -212,6 +212,7 @@
                 mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                 mallGoodsSku.setGoodsId(mallGoods.getId());
                 mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
+                mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
                 mallGoodsSkuMapper.insert(mallGoodsSku);
             }
         }
@@ -388,6 +389,12 @@
 
         mallGoodsMapper.updateById(mallGoods);
 
+        if( 1 == mallGoods.getCarriageType()){
+            mallGoodsMapper.updateCarriageRuleId(mallGoods.getId());
+        }else{
+            mallGoodsMapper.updateCarriageAmount(mallGoods.getId());
+        }
+
         mallGoodsImagesMapper.deleteByGoodsId(mallGoodsUpdateDto.getId());
         String thumbs = mallGoodsUpdateDto.getThumbs();
         if (StrUtil.isNotEmpty(thumbs)) {
@@ -489,6 +496,7 @@
                         mallGoodsSku.setGoodsId(mallGoods.getId());
                         mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                         mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
+                        mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
                         mallGoodsSkuMapper.updateById(mallGoodsSku);
                     } else {
                         //新增商品规格
@@ -504,6 +512,7 @@
                         mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                         mallGoodsSku.setGoodsId(mallGoods.getId());
                         mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
+                        mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
                         mallGoodsSkuMapper.insert(mallGoodsSku);
                     }
                 }

--
Gitblit v1.9.1