diff --git a/mall-gateway/src/main/java/com/suisung/mall/authorization/AuthorizationManager.java b/mall-gateway/src/main/java/com/suisung/mall/authorization/AuthorizationManager.java index 7c649336..d8c4c5f9 100644 --- a/mall-gateway/src/main/java/com/suisung/mall/authorization/AuthorizationManager.java +++ b/mall-gateway/src/main/java/com/suisung/mall/authorization/AuthorizationManager.java @@ -122,17 +122,23 @@ public class AuthorizationManager implements ReactiveAuthorizationManager resourceRolesMap = redisTemplate.opsForHash().entries(AuthConstant.RESOURCE_ROLES_MAP_KEY); +// logger.info("路由器认证用户权限数据：{}", resourceRolesMap); Iterator iterator = resourceRolesMap.keySet().iterator(); List authorities = new ArrayList<>(); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/SFExpressApiService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/SFExpressApiService.java index bda31009..773e2377 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/SFExpressApiService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/SFExpressApiService.java @@ -31,13 +31,15 @@ public interface SFExpressApiService { */ Pair 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); /** * 内部顺丰同城订单下单 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java index d949bdff..b71f6406 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java +++ b/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 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 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; + } + /** * 内部顺丰同城订单下单 * diff --git a/mall-shop/src/main/resources/bootstrap-local.yml b/mall-shop/src/main/resources/bootstrap-local.yml index fc3763ba..be635c5e 100644 --- a/mall-shop/src/main/resources/bootstrap-local.yml +++ b/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 diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml index 4ead74d7..1c45fd3a 100644 --- a/mall-shop/src/main/resources/bootstrap-prod.yml +++ b/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 diff --git a/mall-shop/src/main/resources/bootstrap-test.yml b/mall-shop/src/main/resources/bootstrap-test.yml index c3e9b226..e3a0e20c 100644 --- a/mall-shop/src/main/resources/bootstrap-test.yml +++ b/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 diff --git a/mall-shop/src/main/resources/bootstrap-uat.yml b/mall-shop/src/main/resources/bootstrap-uat.yml index c3e9b226..e3a0e20c 100644 --- a/mall-shop/src/main/resources/bootstrap-uat.yml +++ b/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 diff --git a/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserMessageServiceImpl.java b/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserMessageServiceImpl.java index 01c0d622..16f0fb68 100644 --- a/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserMessageServiceImpl.java +++ b/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserMessageServiceImpl.java @@ -410,7 +410,8 @@ public class SnsUserMessageServiceImpl extends BaseServiceImplwebprod J1XivNvAcR21}pA6Cysm.E29 com.mysql.cj.jdbc.Driver - + 172.16.0.9 0 6480