From 27ae773e20ea5b8d4a971fdb0aa48c6ef0937efa Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Tue, 4 Jun 2024 14:43:37 +0800
Subject: [PATCH] fix & improvement

---
 .../lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java   | 3 +++
 .../modules/promotion/serviceimpl/PintuanServiceImpl.java     | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
index b1851d17..401bf52a 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -743,6 +743,9 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
      * @param goodsSku sku
      */
     void renderImages(GoodsSku goodsSku, List<String> goodsImages) {
+        if (goodsImages == null || goodsImages.isEmpty()) {
+            return;
+        }
         JSONObject jsonObject = JSONUtil.parseObj(goodsSku.getSpecs());
         List<String> images = jsonObject.getBeanList("images", String.class);
         GoodsGallery goodsGallery;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
index 2a3afc29..f261c2e0 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
@@ -107,7 +107,9 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
             //获取已参团人数
             this.setMemberVONum(memberVO, pintuan.getRequiredNum(), order.getSn());
             memberVO.setOrderSn(order.getSn());
-            members.add(memberVO);
+            if (memberVO.getToBeGroupedNum() > 0) {
+                members.add(memberVO);
+            }
         }
         return members;
     }