backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
This commit is contained in:
Jack 2025-10-22 17:47:16 +08:00
commit c3a3b2800a
1 changed files with 14 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,85 +339,6 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
}
}
/**
* 创建顺丰同城（普通型）店铺（直调顺丰同城的接口，脱离我们的业务）
*
* @param storeId 商家门店ID
* @param shopName 店名
* @param cityName 城市
* @param shopAddress 店铺详细地址
* @param contactName 店铺联系人
* @param contactPhone 店铺电话
* @param longitude 经度
* @param latitude 纬度
* @return Pair<Boolean, String> 第一个元素表示是否成功，第二个元素表示结果信息或错误信息
*/
@Override
public Pair<Boolean, String> createSfExpressShopInner(Integer storeId, String shopName, String cityName,
String shopAddress, String contactName, String contactPhone,
String longitude, String latitude) {
logger.info("开始创建顺丰同城店铺, storeId: {}", storeId);
try {
// 1. 验证必要参数
if (CheckUtil.isEmpty(storeId) || StringUtils.isAnyBlank(shopName, shopAddress, contactName, contactPhone)) {
logger.error("创建顺丰店铺，缺少必要参数！storeId:{},shopName:{},shopAddress:{},contactName:{},contactPhone:{}", storeId, shopName, shopAddress, contactName, contactPhone);
return Pair.of(false, "创建顺丰店铺，缺少必要参数！");
}
// 4. 构建请求参数
Map<String, Object> params = buildCommonParams();
params.put("supplier_id", supplierId); // 店铺所属商家id
params.put("out_shop_id", storeId); // 外部店铺ID
params.put("shop_name", shopName); // 店铺名称
params.put("city_name", cityName); // 城市名称
params.put("shop_product_types", "33"); // 33:便利店
params.put("shop_type", 1); // 店铺类型: 1-普通型 2-平台型
params.put("shop_address", shopAddress); // 店铺地址
params.put("longitude", longitude); // 经度
params.put("latitude", latitude); // 纬度
params.put("shop_contact_name", contactName); // 联系人姓名
params.put("shop_contact_phone", contactPhone); // 联系电话
logger.debug("开始创建顺丰店铺，参数：{}", params);
// 5. 发送请求到顺丰接口
String paramJSON = JsonUtil.toJSONString(params);
String sendUrl = buildUrl("createShop", paramJSON);
String responseStr = HttpUtil.post(sendUrl, paramJSON);
logger.debug("创建顺丰店铺结果:{}", responseStr);
if (StrUtil.isBlank(responseStr)) {
logger.error("创建顺丰店铺异常，无返回值！");
return Pair.of(false, "创建顺丰店铺异常，无返回值！");
}
ThirdApiRes apiRes = JSONUtil.toBean(responseStr, ThirdApiRes.class);
if (apiRes == null) {
logger.error("创建顺丰店铺异常，返回值有误！！");
return Pair.of(false, "创建顺丰店铺异常，返回值有误！");
}
// 6. 检查接口调用结果
if (!apiRes.getError_code().equals(0) || apiRes.getResult() == null) {
String errMsg = apiRes.getError_code().equals(0) ? "创建顺丰店铺失败！" : "创建顺丰店铺失败: " + apiRes.getError_msg();
logger.error("创建顺丰店铺失败: {}", errMsg);
return Pair.of(false, errMsg);
}
// 7. 提取顺丰店铺ID并更新数据库
JSONObject result = (JSONObject) apiRes.getResult();
String sfShopId = result.getStr("shop_id");
logger.info("成功创建顺丰店铺，店铺ID: {}", sfShopId);
return Pair.of(true, sfShopId);
} catch (Exception e) {
logger.error("创建顺丰同城店铺时发生异常: ", e);
return Pair.of(false, "创建顺丰同城店铺时发生异常: " + e.getMessage());
}
}
/**
* 创建顺丰同城店铺异步通知回调
*
@ -1245,7 +1166,6 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
/**
* 自行发货
*
* @param orderId
* @return
*/
@ -1281,7 +1201,6 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
/**
* 商家自行配送完成订单
*
* @param shopOrderId
*/
public CommonResult selFinishOrder(String shopOrderId) {
@ -1304,7 +1223,6 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
/**
* 校验订单是否正确
*
* @param shopOrderId
* @return
*/