From 7aed024853584f360178e942381d4c1688d67804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 4 Dec 2024 13:40:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=82=B9=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbOrderDetail.java         | 2 ++
 .../system/cashierservice/service/CartService.java          | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
index e7aa0b1..97b3321 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
@@ -49,5 +49,7 @@ public class TbOrderDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer isMember;
+    private String proGroupInfo;
+
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index b1d2924..213a873 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -347,7 +347,10 @@ public class CartService {
             Integer type = jsonObject.getInteger("type");
             Integer buyNum = jsonObject.getInteger("num");
             Integer userId = jsonObject.getInteger("userId");
-            List<Integer> groupProductIdList = jsonObject.getJSONArray("groupProductIdList").toJavaList(Integer.class);
+            List<Integer> groupProductIdList = null;
+            if (jsonObject.containsKey("groupProductIdList")) {
+                groupProductIdList = jsonObject.getJSONArray("groupProductIdList").toJavaList(Integer.class);
+            }
             // 商品备注
             String note = jsonObject.getString("note");
             if (StringUtils.isBlank(shopId) || StringUtils.isBlank(productId)
@@ -1164,6 +1167,7 @@ public class CartService {
                 orderDetail.setProductSkuName(productSku.getSpecSnap());
             }
 
+            orderDetail.setProGroupInfo(cashierCart.getProGroupInfo());
             orderDetail.setMemberPrice(cashierCart.getMemberPrice());
             orderDetail.setNote(cashierCart.getNote());
             orderDetail.setCreateTime(DateUtil.date().toTimestamp());