From 3d02b77da8c8ac43bef935deb05f67ebab451f4f Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 20 Jun 2025 18:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bsd/pjcloud/supermarket/entity/ShopSpuEntity.java  | 7 ++++++-
 .../supermarket/service/impl/ShopSpuServiceImpl.java       | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSpuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSpuEntity.java
index aa03103e7..abfde0a11 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSpuEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSpuEntity.java
@@ -174,5 +174,10 @@ public class ShopSpuEntity extends Model<ShopSpuEntity> {
     @ExcelIgnore
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "spuId")
-    private List<ShopSkuEntity> shopSkuList;
+    private List<ShopSkuEntity> skuList;
+
+
+	@TableField(exist = false)
+	@Schema(description="关联的商户id")
+	private List<Long> merchantIds;
 }
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopSpuServiceImpl.java
index ee636739a..89ed382f3 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopSpuServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/ShopSpuServiceImpl.java
@@ -30,7 +30,7 @@ public class ShopSpuServiceImpl extends ServiceImpl<ShopSpuMapper, ShopSpuEntity
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveDeep(ShopSpuEntity shopSpu) {
         baseMapper.insert(shopSpu);
-        for (ShopSkuEntity  shopSku : shopSpu.getShopSkuList()) {
+        for (ShopSkuEntity  shopSku : shopSpu.getSkuList()) {
             shopSku.setSpuId(shopSpu.getId());
             shopSkuMapper.insert( shopSku);
         }
@@ -42,7 +42,7 @@ public class ShopSpuServiceImpl extends ServiceImpl<ShopSpuMapper, ShopSpuEntity
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateDeep(ShopSpuEntity shopSpu) {
         baseMapper.updateById(shopSpu);
-        for (ShopSkuEntity  shopSku : shopSpu.getShopSkuList()) {
+        for (ShopSkuEntity  shopSku : shopSpu.getSkuList()) {
             if (Objects.isNull(shopSku.getId())) {
                 shopSku.setSpuId(shopSpu.getId());
                 shopSkuMapper.insert(shopSku);