From 761d9f45dab625844c74339fa33fa8ed8e038bdb Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Tue, 18 Oct 2022 10:34:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88/=E5=95=86=E5=93=81=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=9F=A5sku?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E9=85=8D=E9=80=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/serviceimpl/DraftGoodsServiceImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
index 14860643..facbfe4a 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
@@ -78,13 +78,17 @@ public class DraftGoodsServiceImpl extends ServiceImpl<DraftGoodsMapper, DraftGo
         // 商品参数
         draftGoods.setGoodsParamsListJson(JSONUtil.toJsonStr(draftGoods.getGoodsParamsDTOList()));
         boolean result = this.saveOrUpdate(draftGoods);
-        if (result) {
-            // 商品sku
+        if (result && draftGoods.getSkuList() != null && !draftGoods.getSkuList().isEmpty()) {
             List<GoodsSku> goodsSkus = GoodsSkuBuilder.buildBatch(new Goods(draftGoods), draftGoods.getSkuList());
-            for (WholesaleDTO wholesaleDTO : draftGoods.getWholesaleList()) {
-                wholesaleDTO.setTemplateId(draftGoods.getId());
+            GoodsOperationDTO.GoodsOperationDTOBuilder goodsOperationDTOBuilder = GoodsOperationDTO.builder().goodsTemplateFlag(true).salesModel(draftGoods.getSalesModel());
+            if (draftGoods.getWholesaleList() != null && !draftGoods.getWholesaleList().isEmpty()) {
+
+                for (WholesaleDTO wholesaleDTO : draftGoods.getWholesaleList()) {
+                    wholesaleDTO.setTemplateId(draftGoods.getId());
+                }
+                goodsOperationDTOBuilder.wholesaleList(draftGoods.getWholesaleList());
             }
-            goodsSkuService.renderGoodsSkuList(goodsSkus, GoodsOperationDTO.builder().goodsTemplateFlag(true).wholesaleList(draftGoods.getWholesaleList()).salesModel(draftGoods.getSalesModel()).build());
+            goodsSkuService.renderGoodsSkuList(goodsSkus, goodsOperationDTOBuilder.build());
             LambdaUpdateWrapper<DraftGoods> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(DraftGoods::getId, draftGoods.getId());
             updateWrapper.set(DraftGoods::getSkuListJson, JSONUtil.toJsonStr(goodsSkus));