From 0f89de9ef42c786bb8309fdea8696f59805eb08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Tue, 2 Apr 2024 10:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=82=B9=E3=80=81=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95=E4=B8=9A=E5=8A=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8Dv8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/service/impl/RecycleOrderServiceImpl.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
index 9783dad..f8f88ae 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
@@ -385,7 +385,11 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
     @Transactional(rollbackFor = Exception.class)
     public void finishOrder(RecycleOrderFinishVO orderFinishVO) {
         RecycleOrder recycleOrder = this.getOrderById(orderFinishVO.getId(), true);
-        if (!recycleOrder.getStaffsId().equals(orderFinishVO.getStaffsId())) {
+        String recyclerId = recycleOrder.getStaffsId();
+        if(StrUtil.isEmpty(recyclerId)) {   // 兼容定点回收
+            recyclerId = orderFinishVO.getStaffsId();
+        }
+        if (recyclerId.equals(orderFinishVO.getStaffsId())) {
             throw new ForbiddenException("非法操作!");
         }
         if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.FINISHED)) {
@@ -408,11 +412,11 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
 
         // 记录关键信息
         String clientId = recycleOrder.getClientId();
-        String recyclerId = recycleOrder.getStaffsId();
         String orderNumber = recycleOrder.getOrderNumber();
-        String recycleStationId = recycleOrder.getRecycleStationId();
+//        String recycleStationId = recycleOrder.getRecycleStationId();
 
         RecycleOrder recycleOrder1 = BeanUtils.copyBean(orderFinishVO, RecycleOrder.class);
+        recycleOrder1.setStaffsId(recyclerId);
         recycleOrder1.setOrderStatus(OrderStatusEnum.FINISHED);
         recycleOrder1.setCompleteTime(LocalDateTime.now());
         log.info("recycleOrder orderFinishVO: {}", recycleOrder1);