定点、到站回收订单业务功能bug问题修复v8

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);