From 06167c16ee2b47f90d517105470763cbefb35b24 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 20 Jun 2025 13:42:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java | 2 +-
 .../src/main/resources/mapper/SmErpStockMapper.xml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java
index fa5a659eb..a8cd0bb03 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java
@@ -34,7 +34,7 @@ public class StockWarnVO {
      * 自编码/条码
      */
     @Schema(description="自编码/条码")
-    private String barcode;
+    private String barCode;
 
     /**
      * 商品名称
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml
index 09f78fdbb..5a41639f5 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml
@@ -40,7 +40,7 @@
             stock.current_stock as stock,
             spu.product_code,
             spu.product_name,
-            spu.barcode,
+            spu.bar_code,
             spu.spec,
             spu.unit,
             spu.package_num,
@@ -61,7 +61,7 @@
                         AND spu.product_code = #{param.productCode}
                   </if>
                   <if test="param.barcode != null and param.barcode != ''">
-                        AND spu.barcode = #{param.barcode}
+                        AND spu.bar_code = #{param.barCode}
                   </if>
                   <if test="param.productName != null and param.productName != ''">
                         AND spu.product_name LIKE CONCAT('%', #{param.productName}, '%')

From f6411676c3401ba743fe2630aeda966123208bdb Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 20 Jun 2025 13:55:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java     | 2 +-
 .../bsd/pjcloud/supermarket/vo/sm/smspu/SmErpPageScopeVo.java | 2 +-
 .../src/main/resources/mapper/SmSpuMapper.xml                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java
index e3430e109..9ecf0a2bd 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/OnlineShopVo.java
@@ -63,7 +63,7 @@ public class OnlineShopVo {
      * 自编码/条码
      */
     @Schema(description="自编码/条码")
-    private String barcode;
+    private String barCode;
 
     /**
      * 商品名称
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/SmErpPageScopeVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/SmErpPageScopeVo.java
index 7b9a03cb3..26ab7851d 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/SmErpPageScopeVo.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/SmErpPageScopeVo.java
@@ -24,7 +24,7 @@ public class SmErpPageScopeVo {
      * 自编码/条码
      */
     @Schema(description="自编码/条码")
-    private String barcode;
+    private String barCode;
 
     /**
      * 商品名称
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml
index a1d96d1d3..b9ce1ff03 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml
@@ -21,7 +21,7 @@
         <result property="tenantId" column="tenant_id"/>
   </resultMap>
     <select id="selectSmErpPageScopeVo" resultType="com.bsd.pjcloud.supermarket.vo.sm.smspu.SmSpuPageVo">
-          select esp.id as erp_spu_id,esp.product_code,esp.barcode,esp.product_name,esp.category_id,
+          select esp.id as erp_spu_id,esp.product_code,esp.bar_code,esp.product_name,esp.category_id,
                  esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,
                  sp.create_time,sp.id,sp.slider_pic_urls,
                  eca.name as category_name
@@ -60,7 +60,7 @@
         </where>
     </select>
     <select id="getOnlineShopList" resultType="com.bsd.pjcloud.supermarket.vo.OnlineShopVo">
-        SELECT  esp.id as erp_spu_id,esp.product_code,esp.barcode,esp.product_name,esp.category_id,
+        SELECT  esp.id as erp_spu_id,esp.product_code,esp.bar_code,esp.product_name,esp.category_id,
                  esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,esp.bar_code,
                  sp.create_time,sp.id,sp.slider_pic_urls,sp.description,
                  eca.name as category_name,

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 3/3] =?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);