From 0131947c7c0abd99c0f6058122d22e247bb7a0ca Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 5 Jun 2025 12:07:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/controller/SmSpuController.java        | 10 +++++-----
 .../src/main/resources/mapper/SmSpuMapper.xml          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
index f8d3103c8..44ae34f58 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
@@ -93,11 +93,11 @@ public class SmSpuController {
     public R save(@RequestBody SmSpuEntity smSpu) {
         Long deptId = SecurityUtils.getUser().getDeptId();
         //查询商户，设置商户id
-//        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
-//        MchManageVo data = byDeptId.getData();
-//        if (Objects.isNull(data) || !data.getTypes().contains("2")){
-//            return R.failed("当前用户未绑定超市商户");
-//        }
+        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
+        MchManageVo data = byDeptId.getData();
+        if (Objects.isNull(data) || !data.getTypes().contains("2")){
+            return R.failed("当前用户未绑定超市商户");
+        }
         smSpu.setDeptId(deptId);
 //        smSpu.setMerchantId(data.getId());
         return R.ok(smSpuService.save(smSpu));
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 6e0b13f83..e7ef6604f 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
@@ -23,7 +23,7 @@
     <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,
                  esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,
-                 sp.create_time,sp.id,
+                 sp.create_time,sp.id,sp.slider_pic_urls,
                  eca.name as category_name
           from sm_spu sp
           left join sm_erp_spu esp

From c7efc3ba0dd8f9b3f526131d1f32740c2cb53286 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 9 Jun 2025 11:34:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bsd/pjcloud/supermarket/controller/SmSpuController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
index 44ae34f58..e819b1f23 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
@@ -99,7 +99,7 @@ public class SmSpuController {
             return R.failed("当前用户未绑定超市商户");
         }
         smSpu.setDeptId(deptId);
-//        smSpu.setMerchantId(data.getId());
+        smSpu.setMerchantId(data.getId());
         return R.ok(smSpuService.save(smSpu));
     }
 

From f2382b3f70b919782f2c9df5dc1461c64742fd44 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 9 Jun 2025 12:13:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/controller/SmSpuController.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
index e819b1f23..f8d3103c8 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java
@@ -93,13 +93,13 @@ public class SmSpuController {
     public R save(@RequestBody SmSpuEntity smSpu) {
         Long deptId = SecurityUtils.getUser().getDeptId();
         //查询商户，设置商户id
-        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
-        MchManageVo data = byDeptId.getData();
-        if (Objects.isNull(data) || !data.getTypes().contains("2")){
-            return R.failed("当前用户未绑定超市商户");
-        }
+//        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
+//        MchManageVo data = byDeptId.getData();
+//        if (Objects.isNull(data) || !data.getTypes().contains("2")){
+//            return R.failed("当前用户未绑定超市商户");
+//        }
         smSpu.setDeptId(deptId);
-        smSpu.setMerchantId(data.getId());
+//        smSpu.setMerchantId(data.getId());
         return R.ok(smSpuService.save(smSpu));
     }