From df0aae91eb651107c33c463df9eda151793dd5d5 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sat, 20 Feb 2021 10:33:12 +0800
Subject: [PATCH] =?UTF-8?q?#I2CIHA=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC-?=
 =?UTF-8?q?=E4=BD=A3=E9=87=91=E5=8D=95=E7=8B=AC=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yixiang/modules/product/service/dto/ProductFormatDto.java   | 2 ++
 .../modules/product/service/impl/YxStoreProductServiceImpl.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
index 09662922..53463da7 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
@@ -27,6 +27,8 @@ import java.util.Map;
 @Setter
 public class ProductFormatDto {
 
+    private String sku = "";
+
     @JsonProperty("bar_code")
     private String barCode = "";
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index b924f604..a83d9b14 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -656,6 +656,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
 //
 //            private Integer seckillStock;
             valueMap.put("detail", detail);
+            valueMap.put("sku", "");
             valueMap.put("pic", "");
             valueMap.put("price", 0);
             valueMap.put("cost", 0);
@@ -677,6 +678,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
                                 .eq(YxStoreProductAttrValue::getProductId, id)
                                 .eq(YxStoreProductAttrValue::getSku, sku));
                 if (storeProductAttrValue != null) {
+                    valueMap.put("sku",storeProductAttrValue.getSku());
                     valueMap.put("pic", storeProductAttrValue.getImage());
                     valueMap.put("price", storeProductAttrValue.getPrice());
                     valueMap.put("cost", storeProductAttrValue.getCost());