B

Merge branch 'main' into dev

mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java

@@ -466,7 +466,7 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl<ShopOrderInfoMappe
             }
 
             Map<String, Object> requestParams = new HashMap<>();
-            requestParams.put("order_id", sfOrderId);
+            requestParams.put("order_id", sfOrderId); // 顺丰订单号
             requestParams.put("store_id", storeId);
 
             ThirdApiRes response = sfExpressApiService.notifyProductReady(requestParams);

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

@@ -832,7 +832,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
 
         params.put("order_type", 1); // 1表示顺丰订单号、2表示商家订单号
         params.put("shop_id", shopStoreSameCityTransportBase.getShop_id());
-        params.put("shop_type", 2);// 1表示顺丰店铺id、2表示接入方店铺id
+        params.put("shop_type", 1);// 1表示顺丰店铺id、2表示接入方店铺id
         params.put("notice_ready_time", System.currentTimeMillis() / 1000);
         params.putAll(buildCommonParams());