merge

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

@@ -39,6 +39,7 @@ import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.service.trace.TruckTraceService;
 import com.clx.performance.struct.*;
 import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.utils.spring.ApplicationContextUtils;
@@ -61,7 +62,9 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;