From 87b15279b718674ab40df3520caae37bf4345bbb Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 1 Jul 2025 18:03:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BA=97=E9=93=BA=20=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/shop/order/service/ShopOrderReturnService.java    | 5 +++++
 .../shop/order/service/impl/ShopOrderBaseServiceImpl.java  | 2 +-
 .../shop/store/service/impl/ShopMchEntryServiceImpl.java   | 2 +-
 .../shop/store/service/impl/ShopStoreBaseServiceImpl.java  | 7 ++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java
index cd5bf4f7..145daa33 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java
@@ -110,6 +110,11 @@ public interface ShopOrderReturnService extends IBaseService<ShopOrderReturn> {
      */
     boolean doOnlineRefund(String return_id);
 
+    /**
+     * 更新退款订单状态
+     *
+     * @param shopOrderReturn
+     */
     boolean updateRefundOrderReturn(ShopOrderReturn shopOrderReturn);
 
     /**
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index eff942d6..9f2714cf 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -2381,7 +2381,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     throw new ApiException(I18nUtil._("该状态不可进行出库审核"));
                 }
             } else {
-                throw new ApiException(I18nUtil._("没有操作权限"));
+                throw new ApiException(I18nUtil._("无操作权限"));
             }
         }
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
index 464d5f29..7b8715ee 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
@@ -278,7 +278,7 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
             return CommonResult.failed("入驻信息提交失败！");
         }
 
-        // 尊敬的管理员，商家 ${name}，提交了入驻我们平台的申请，请及时对相关资质材料予以审核，以便推进后续流程。
+        // 给平台管理员发短信，通知有商家入驻：尊敬的管理员，商家 ${name}，提交了入驻我们平台的申请，请及时对相关资质材料予以审核，以便推进后续流程。
         // 获取平台方的手机号码，发送短信通知
         Pair<String, String> mobileAndLicenseNumber = esignPlatformInfoService.getEsignPlatformMobileAndLicenseNumber();
         if (mobileAndLicenseNumber != null) {
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index 6a9a1f34..6607a49d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -1178,6 +1178,11 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
     @Override
     public Map info() {
 
+        Integer store_id = Convert.toInt(getParameter("store_id"));
+        if (ObjectUtil.isNull(store_id)) {
+            throw new ApiException(I18nUtil._("缺少必要参数！"));
+        }
+
         Map rows = new HashMap();
         UserDto user = getCurrentUser();
         Integer user_id = ObjectUtil.isNotNull(user) ? user.getId() : null;
@@ -1185,7 +1190,7 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
         ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         CompletableFuture<Void> infoFuture1 = CompletableFuture.runAsync(() -> {
             RequestContextHolder.setRequestAttributes(servletRequestAttributes, true);
-            Integer store_id = Convert.toInt(getParameter("store_id"));
+            //Integer store_id = Convert.toInt(getParameter("store_id"));
             ShopStoreBase shopStoreBase = shopStoreBaseService.get(store_id);
 
             Map store_base_row = Convert.toMap(String.class, Object.class, shopStoreBase);