From 8f7b362b076f875dafbb3fad7eee04cacd9d5ff4 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 27 May 2020 17:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E9=AA=8C=E8=AF=81,=E5=A2=9E=E5=8A=A0=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=9C=89sku=E5=88=99=E5=90=8C=E6=AD=A5sku=E6=80=BB?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8E=E6=9C=80=E5=B0=8F=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shop/domain/YxStoreProduct.java   | 16 ++++++----
 .../impl/YxStoreProductServiceImpl.java       | 31 ++++++++++++++-----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java
index f4eb300b..12ddb2da 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java
@@ -10,12 +10,9 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import lombok.*;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -24,8 +21,13 @@ import java.math.BigDecimal;
 * @date 2020-05-12
 */
 
-@Data
+
 @TableName("yx_store_product")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
 public class YxStoreProduct implements Serializable {
 
     /** 商品id */
@@ -104,6 +106,8 @@ public class YxStoreProduct implements Serializable {
 
 
     /** 库存 */
+    @NotNull(message = "请输入库存")
+    @Min(message = "库存不能小于0",value = 1)
     private Integer stock;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
index ac0f28ad..e5c1dce6 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
@@ -43,13 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 // 默认不使用缓存
@@ -242,6 +236,29 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
             throw new BadRequestException("请设置至少一个属性!");
         }
 
+        //如果设置sku 处理价格与库存
+
+        ////取最小价格
+        BigDecimal minPrice = valueGroup
+                .stream()
+                .map(YxStoreProductAttrValue::getPrice)
+                .min(Comparator.naturalOrder())
+                .orElse(BigDecimal.ZERO);
+
+        //计算库存
+        Integer stock = valueGroup
+                .stream()
+                .map(YxStoreProductAttrValue::getStock)
+                .reduce(Integer::sum)
+                .orElse(0);
+
+        YxStoreProduct yxStoreProduct = YxStoreProduct.builder()
+                .stock(stock)
+                .price(minPrice)
+                .id(id)
+                .build();
+        this.updateById(yxStoreProduct);
+
         //插入之前清空
         clearProductAttr(id,false);