权限管理，超管放行

mall-gateway/src/main/java/com/suisung/mall/authorization/AuthorizationManager.java

@@ -122,17 +122,23 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
             return Mono.just(new AuthorizationDecision(true));
         }*/
 
-        // 门店管理员放行
+
         String realToken = token.replace(AuthConstant.JWT_TOKEN_PREFIX, "");
         JWSObject jwsObject = JWSObject.parse(realToken);
         String userStr = jwsObject.getPayload().toString();
         UserDto userDto = JSONUtil.toBean(userStr, UserDto.class);
 
 //        logger.info("路由器认证用户数据：{}", userDto);
-        if (userDto.getRole_id() != null && (userDto.getRole_id() == RoleIdEnum.STORE.getState() || userDto.getRole_id() == RoleIdEnum.CHAIN.getState())) {
+        // 门店管理员放行， 2025-08-12 add 平台管理员放行
+        if (userDto.getRole_id() != null
+                && (userDto.getRole_id() == RoleIdEnum.STORE.getState()
+                || userDto.getRole_id() == RoleIdEnum.CHAIN.getState()
+                || userDto.getRole_id() == RoleIdEnum.PLATFORM.getState()
+        )) {
             return Mono.just(new AuthorizationDecision(true));
         }
 
+
         //演示站
 //        if (uri.getPath().startsWith("/admin") || uri.getPath().startsWith("/api/admin")) {
 //            //处理操作权限判断
@@ -147,6 +153,7 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
 
         //管理端路径需校验权限
         Map<Object, Object> resourceRolesMap = redisTemplate.opsForHash().entries(AuthConstant.RESOURCE_ROLES_MAP_KEY);
+//        logger.info("路由器认证用户权限数据：{}", resourceRolesMap);
 
         Iterator<Object> iterator = resourceRolesMap.keySet().iterator();
         List<String> authorities = new ArrayList<>();

mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/SFExpressApiService.java

@@ -31,13 +31,15 @@ public interface SFExpressApiService {
      */
     Pair<Boolean, String> createSfExpressShop(Integer storeId, String shopName, String cityName, String shopAddress, String contactName, String contactPhone, String longitude, String latitude);
 
+    ThirdApiRes createOrder(String shopOrderId);
+
     /**
-     * （店铺）创建顺丰同城订单
+     * 获取顺丰同城店铺信息
      *
-     * @param shopOrderId 商家订单号
+     * @param sfShopId 商家订单号
      * @return
      */
-    ThirdApiRes createOrder(String shopOrderId);
+    ThirdApiRes getShopInfo(String sfShopId);
 
     /**
      * 内部顺丰同城订单下单

mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java

@@ -91,10 +91,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
     @Lazy
     @Autowired
     private PushMessageService pushMessageService;
-//
+
-//    @Lazy
-//    @Autowired
-//    private GeTuiPushService geTuiPushService;
 
     /**
      * 创建顺丰同店铺-连锁店铺
@@ -119,6 +116,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
 
         ShopStoreSameCityTransportBase shopStoreSameCityTransportBase = shopStoreSameCityTransportBaseService.getShopStoreSameCityTransportBaseById(Long.valueOf(storeId));
         if (shopStoreSameCityTransportBase == null) {
+            // 如果没有商家配送运费设置（包含有顺丰店铺ID字段在里面），则初始化
             Pair<Boolean, String> result = shopStoreSameCityTransportBaseService.initDefaultSameCityTransport(storeId);
             if (!result.getFirst()) {
                 return result;
@@ -264,6 +262,31 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
         return JsonUtil.json2object(retRespStr, ThirdApiRes.class);
     }
 
+    /**
+     * 获取顺丰同城店铺信息
+     *
+     * @param sfShopId 商家订单号
+     * @return
+     */
+    @Override
+    public ThirdApiRes getShopInfo(String sfShopId) {
+        // 请求参数转换 json 字符串参数
+
+        Map<String, Object> paramMap = buildCommonParams();
+        paramMap.put("shop_id", sfShopId);
+        // 根据参数生成请求签名
+        String send_url = buildUrl("getshopinfo", JSONUtil.toJsonStr(paramMap));
+
+//        // 向顺丰同城 创建一个顺丰同城配送订单
+//        String retRespStr = HttpUtil.post(send_url, paramJSON);
+//        if (StrUtil.isEmpty(retRespStr)) {
+//            logger.error("创建顺丰同城订单异常，无返回值！");
+//            return Pair.of(false, "顺丰同城下单异常，无返回值！");
+//        }
+
+        return null;
+    }
+
     /**
      * 内部顺丰同城订单下单
      *

mall-shop/src/main/resources/bootstrap-local.yml

@@ -139,7 +139,7 @@ feieyun:
 sf-express:
   # 顺丰同城 api 接口配置
   appid: 1711573316
-  supplier_id: 0
+  supplier_id: 2280784732353
   appkey: cd57608baa9c00fe1cda5f652b14240d
   dev_id: 1711573316
   enable: 2

mall-shop/src/main/resources/bootstrap-prod.yml

@@ -145,7 +145,7 @@ feieyun:
 sf-express:
   # 顺丰同城 api 接口配置
   dev_id: 1711573316
-  supplier_id: 0
+  supplier_id: 2280784732353
   appid: 1711573316
   appkey: cd57608baa9c00fe1cda5f652b14240d
   #  dev_id: 1715091463

mall-shop/src/main/resources/bootstrap-test.yml

@@ -143,7 +143,7 @@ feieyun:
 sf-express:
   # 顺丰同城 api 接口配置
   appid: 1711573316
-  supplier_id: 0
+  supplier_id: 2280784732353
   appkey: cd57608baa9c00fe1cda5f652b14240d
   dev_id: 1711573316
   enable: 2

mall-shop/src/main/resources/bootstrap-uat.yml

@@ -143,7 +143,7 @@ feieyun:
 sf-express:
   # 顺丰同城 api 接口配置
   appid: 1711573316
-  supplier_id: 0
+  supplier_id: 2280784732353
   appkey: cd57608baa9c00fe1cda5f652b14240d
   dev_id: 1711573316
   enable: 2

mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserMessageServiceImpl.java

@@ -410,7 +410,8 @@ public class SnsUserMessageServiceImpl extends BaseServiceImpl<SnsUserMessageMap
         Integer user_id = ObjectUtil.isNotNull(user) ? user.getId() : getParameter("uid", Integer.class);
 
         if (user_id == null) {
-            throw new ApiException(ResultCode.NEED_LOGIN);
+            // throw new ApiException(ResultCode.NEED_LOGIN);
+            throw new ApiException("im 初始化失败，账号有异常！");
         }
 
         Map data = new HashMap();

pom.xml

@@ -476,7 +476,7 @@
                 <mysql.user>webprod</mysql.user>
                 <mysql.pwd>J1XivNvAcR21}pA6Cysm.E29</mysql.pwd>
                 <mysql.driver>com.mysql.cj.jdbc.Driver</mysql.driver>
-                <!-- redis7配置 -->
+                <!-- redis配置 -->
                 <redis.host>172.16.0.9</redis.host>
                 <redis.database>0</redis.database>
                 <redis.port>6480</redis.port>