From 9ae6a06571d8f0c2c81f841815b6629c2f75ca26 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Tue, 5 Jun 2018 22:05:41 +0800 Subject: [PATCH] =?UTF-8?q?fix[litemall-admin-api]:=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=B5=B7=E5=A7=8B=E6=97=B6=E9=97=B4=E4=BB=8E?= =?UTF-8?q?shipEndTime=E8=B0=83=E6=95=B4=E8=87=B3shipStartTime=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/linlinjava/litemall/admin/web/AdminOrderController.java | 2 +- .../linlinjava/litemall/db/service/LitemallOrderService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java index 93ddfe94..a84a3600 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java @@ -231,7 +231,7 @@ public class AdminOrderController { * 早点清理未付款情况，这里八天再确认是可以的。 * * TODO - * 目前自动确认是基于管理后台管理员所设置的商品快递到达时间，见orderService.queryUnconfirm。 + * 目前自动确认是基于管理后台管理员所设置的商品快递时间，见orderService.queryUnconfirm。 * 那么在实际业务上有可能存在商品寄出以后商品因为一些原因快递最终没有到达， * 也就是商品快递失败而shipEndTime一直是空的情况，因此这里业务可能需要扩展，以防止订单一直 * 处于发货状态。 diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java index 4237c173..01bd2e97 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java @@ -153,7 +153,7 @@ public class LitemallOrderService { public List queryUnconfirm() { LitemallOrderExample example = new LitemallOrderExample(); - example.or().andOrderStatusEqualTo(OrderUtil.STATUS_SHIP).andShipEndTimeIsNotNull().andDeletedEqualTo(false); + example.or().andOrderStatusEqualTo(OrderUtil.STATUS_SHIP).andShipStartTimeIsNotNull().andDeletedEqualTo(false); return orderMapper.selectByExample(example); }