Merge remote-tracking branch 'origin/v5.3_driver_integral_20231009' into…

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -29,6 +29,8 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     boolean updateStatus(OrderChild item);
 
+    boolean updateArriveReceiveAddress(OrderChild item);
+
     boolean updateLoad(OrderChild item);
     boolean updateUnload(OrderChild item);
     boolean updateLoadAndUnload(OrderChild item);

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -40,6 +40,15 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public boolean updateArriveReceiveAddress(OrderChild item) {
+        return update(lUdWrapper()
+                .eq(OrderChild::getId, item.getId())
+                .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getArriveReceiveTime, item.getArriveReceiveTime())
+        );
+    }
+
     @Override
     public boolean updateLoad(OrderChild item) {
         return update(lUdWrapper()

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -504,7 +504,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         orderChild.setStatus(OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
-        orderChildDao.updateStatus(orderChild);
+        orderChild.setArriveReceiveTime(LocalDateTime.now());
+        orderChildDao.updateArriveReceiveAddress(orderChild);
 
         // 日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.ARRIVE_RECEIVE.getCode(),