Merge branch 'main' into dev
This commit is contained in:
liyj 2025-10-22 17:42:28 +08:00
commit be821d0265
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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表示顺丰店铺id2表示接入方店铺id
params.put("shop_type", 1);// 1表示顺丰店铺id2表示接入方店铺id
params.put("notice_ready_time", System.currentTimeMillis() / 1000);
params.putAll(buildCommonParams());