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
This commit is contained in:
Jack 2025-10-23 10:36:52 +08:00
commit e341d619e5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1273,9 +1273,10 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
}
}
return CommonResult.success("操作成功");
//出库扣减思迅库存end
}
return CommonResult.success("操作成功");
return CommonResult.failed("操作失败："+pair.getSecond());
}
/**

12
mall-shop/src/main/java/com/suisung/mall/shop/wechat/service/impl/WxOrderShippingServiceImpl.java
View File

@ -113,16 +113,16 @@ public class WxOrderShippingServiceImpl implements WxOrderShippingService {
shippingItem.set("tracking_no", shopOrderLogistics.getOrder_tracking_number());
shippingItem.set("express_company", shopOrderLogistics.getLogistics_number());
} else if (logisticsType == 2) {
} else if (logisticsType == 2) {//同城配送tracking_no和express_company为非必填项，如果存在自行配送，也可以手动发货
ShopStoreSfOrder shopStoreSfOrder = shopStoreSfOrderService.getByShopOrderId(orderId);
if (shopStoreSfOrder == null) {
if (shopStoreSfOrder != null) {
shippingItem.set("tracking_no", shopStoreSfOrder.getSf_bill_id());//非必填字段
shippingItem.set("express_company", "SF");//非必填字段
}else {
log.error("无法获取顺丰同城订单记录，订单ID: {}", orderId);
return Pair.of(false, "无法获取顺丰同城订单记录");
// return Pair.of(false, "无法获取顺丰同城订单记录");
}
shippingItem.set("tracking_no", shopStoreSfOrder.getSf_bill_id());
shippingItem.set("express_company", "SF");
}
shippingItem.putOpt("contact", new JSONObject()
.set("receiver_contact", receiverContact));