From a334cfce293c46d5acc144c42d3833e6af7290be Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Sun, 19 Oct 2025 01:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E4=B8=B0=E5=88=9B=E5=BB=BA=E5=BA=97?= =?UTF-8?q?=E9=93=BA=EF=BC=8C=E5=9C=B0=E5=9D=80=E6=94=B9=E6=88=90=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=9C=81=E5=B8=82=E5=8C=BA=E7=9A=84=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E5=9C=B0=E5=9D=80=E3=80=82=20=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ShopOrderBaseController.java | 9 ++++++--- .../order/service/impl/ShopOrderBaseServiceImpl.java | 12 ++++++------ .../order/service/impl/ShopOrderInfoServiceImpl.java | 2 +- .../service/impl/SFExpressApiServiceImpl.java | 1 - .../resources/mapper/order/ShopOrderBaseMapper.xml | 5 +++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java index fd82bf33..37287b1c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java @@ -103,7 +103,7 @@ public class ShopOrderBaseController extends BaseControllerImpl { public CommonResult cancel(@RequestParam(name = "order_id") String order_id) { return shopOrderBaseService.cancel(order_id); } - + @ApiOperation(value = "确认收货", notes = "确认收货") @RequestMapping(value = "/receive", method = {RequestMethod.GET, RequestMethod.POST}) public CommonResult receive(@RequestParam(name = "order_id") String order_id) { @@ -326,9 +326,12 @@ public class ShopOrderBaseController extends BaseControllerImpl { return CommonResult.failed(ResultCode.FORBIDDEN); } - // 同城订单超时秒数 + // 初定同城订单超时的秒数 long mchOrderExpireSeconds = shopOrderBaseService.sameCityOrderExpireSeconds(2100L); // 35分钟超时，60秒*35分钟 = 2100秒 + //同城配送订单状态（delivery=1时才生效）：无值 or 0-全部订单；1-进行中订单；2-异常（超时）订单；3-退款订单；9-已完成订单 + Integer status = params.getInt("status"); + // === 构建响应数据 === Map respMap = new HashMap<>(); // 订单列表数据（缓存时间25分钟） @@ -336,7 +339,7 @@ public class ShopOrderBaseController extends BaseControllerImpl { storeId, params.getStr("keyword"), params.getInt("delivery"), - params.getInt("status"), + status, params.getInt("logistics_status"), mchOrderExpireSeconds, params.getLong("begin_time"), diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index 5a02f88c..222b0d10 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -8907,17 +8907,16 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl= StateCode.ORDER_STATE_SHIPPED - && orderStateId <= StateCode.ORDER_STATE_FINISH + } else if (CommonService.isSFExpress(deliveryTypeId) + && orderStateId.intValue() >= StateCode.ORDER_STATE_SHIPPED + && orderStateId.intValue() <= StateCode.ORDER_STATE_FINISH && order.getSf_order_info() != null - && order.getSf_order_info().getFeed() == null) { + && StrUtil.isBlank(order.getSf_order_info().getFeed())) { // 获取顺丰同城的物流轨迹 Map params = new HashMap<>(); params.put("order_id", order.getSf_order_info().getSf_order_id()); try { + ThirdApiRes feedRes = sfExpressApiService.listOrderFeed(params); logger.info("获取配送员物流轨迹:{}", feedRes); if (feedRes != null && feedRes.getError_code() != null && feedRes.getError_code().equals(0)) { @@ -8926,6 +8925,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 3) { - return CommonResult.success("已提交，请勿重复提交"); + return CommonResult.success("已通知配送人员，请稍候"); } // 更新订单拣货时间 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 3f3f298d..1c9e8289 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 @@ -190,7 +190,6 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { // 为了其他顺丰店同名，店铺名称加上[门店ID]; 如：xxxx[xxxx] 聚万家生鲜超市[69] String shopStoreName = String.format("%s[%s]", shopMchEntry.getStore_name(), shopMchEntry.getStore_id()); - // 调用创建店铺方法 Pair result = createSfExpressShop( Convert.toInt(shopMchEntry.getStore_id()), diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml index a4b55af8..0a7ab502 100644 --- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml +++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml @@ -655,6 +655,7 @@ + @@ -684,12 +685,12 @@ - AND ob.order_state_id IN (2011,2012,2013, 2014, 2020, 2030, 2040) + AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040) AND (oi.order_time + #{expireSeconds}*1000) =]]> UNIX_TIMESTAMP() * 1000 - AND ob.order_state_id IN (2011,2012,2013, 2014, 2020, 2030, 2040) + AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040) AND (oi.order_time + #{expireSeconds}*1000) UNIX_TIMESTAMP() * 1000