From 7bdbb8ff5591a403bfe43bc599355c157fc1f00b Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 02 Jul 2021 11:37:07 +0800 Subject: [PATCH] fix --- gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java index 82b33be..b31e711 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java @@ -352,7 +352,12 @@ throw new RestException(-3, "暂不能确认收货"); } - scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId); + if (ScoreOrder.ISFINISH_YES.equals(order.getIsFinish())) { + scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DONE, userId); + } else { + scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId); + } + } public void cancelOrder(Long id, String userId) { -- Gitblit v1.9.1