From 47c9368a96bd27c2a7be91b8963193c5e2c9a9a6 Mon Sep 17 00:00:00 2001
From: eric <465889110@qq.com>
Date: Mon, 1 Sep 2025 12:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sync/service/impl/ReceiveServiceImpl.java | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
index 3583a78..c8fff31 100644
--- a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
+++ b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
@@ -56,7 +56,17 @@ public class ReceiveServiceImpl implements ReceiveService {
             map.put("code","500");
             return map;
         }
-        BatteryRule batteryRule = JSON.parseObject(String.valueOf(syncRequest.getData()), BatteryRule.class);
+        BatteryRule batteryRule = new BatteryRule();
+        try {
+            batteryRule = JSON.parseObject(String.valueOf(syncRequest.getData()), BatteryRule.class);
+        }catch (Exception e)
+            {
+            map.put("msg","数据格式错误");
+            map.put("exception",e.getMessage());
+            map.put("code","500");
+            return map;
+        }
+
         if (batteryRule.getTitle() == null || batteryRule.getTitle().isEmpty()){
             map.put("msg","套餐名称不能为空");
             map.put("code","500");
@@ -84,7 +94,7 @@ public class ReceiveServiceImpl implements ReceiveService {
             map.put("code","500");
             return map;
         }
-        if (batteryRule.getCity() == null){
+        if (batteryRule.getCity() == null ){
             map.put("msg","套餐城市不能为空");
             map.put("code","500");
             return map;
@@ -168,6 +178,13 @@ public class ReceiveServiceImpl implements ReceiveService {
             map.put("code", "500");
             return map;
         }
+        if(user.getIsmerchant() == 1){
+            if (user.getStoreId() == null || user.getStoreId().isEmpty()) {
+                map.put("msg", "用户为商户时门店不能为空");
+                map.put("code", "500");
+                return map;
+            }
+        }
 
         BaseUser baseUser = new BaseUser();
 
@@ -194,6 +211,7 @@ public class ReceiveServiceImpl implements ReceiveService {
 
         UserStore userStore = new UserStore();
         String storeIds = user.getStoreId();
+
         String[] storeIdsArray = storeIds.split(",");
         for (String storeId : storeIdsArray) {
             userStore.setStoreId(Long.parseLong(storeId));