feature(运单):接口调整

http/yundan_renzheng.http

 ###
-GET http://localhost:8081/clx-performance/app/goodsOrder/getOrderGoodsInfo?orderGoodsNo=GK2024073100004
\ No newline at end of file
+GET http://localhost:8081/clx-performance/app/goodsOrder/getOrderGoodsInfo?orderGoodsNo=GK2024073100004
+
+###
+GET http://localhost:8081/clx-performance/app/driver/orderChild/getOrderChildInfo?childNo=CYD2024073113994137
+productchannel:android_app
+imei:22965e13c2e1233cdbc682a56484e2b5e
+product-code:carrier-driver-app
+content-type:application/json;charset=UTF-8
+versioncode:9
+platform:1
+token:da38733eb052496fb7b4991bf643c626
+producttype:carrier-driver-app
+versionname:1.0.8
\ No newline at end of file

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

@@ -8,7 +8,6 @@ import com.clx.order.enums.ResultEnum;
 import com.clx.order.enums.*;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
-import com.clx.order.vo.feign.FeignOrderDetailVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
@@ -60,8 +59,6 @@ import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
-import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
-import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.feign.DocumentFeign;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
@@ -88,8 +85,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;
@@ -1707,6 +1704,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         result.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
         result.setLoadEndTime(orderInfoFeign.getLoadEndTime());
 
+        //货源地信息
+        result.setSendContact(orderInfoFeign.getSendContact());
+        result.setSendContactPhone(orderInfoFeign.getSendContactPhone());
+        result.setSendWaitSystem(orderInfoFeign.getSendWaitSystem());
+        result.setSendWaitSystemName(orderInfoFeign.getSendWaitSystemName());
+        result.setSendWaitMode(orderInfoFeign.getSendWaitMode());
+
         //查询结算信息
         Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
         if(optional.isPresent()){
@@ -1732,18 +1736,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         //查询进行中的运单车辆是否开启了中交兴路
         result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo()));
-
-        // 设置货源地信息
-        Result<FeignOrderDetailVO> orderDetailFeignResult = orderFeign.getOrderDetail(orderChild.getOrderNo());
-        if (orderDetailFeignResult != null && orderDetailFeignResult.getData() != null) {
-            FeignOrderDetailVO orderDetailFeign = orderDetailFeignResult.getData();
-            //货源地信息
-            result.setSendContact(orderDetailFeign.getSendContact());
-            result.setSendContactPhone(orderDetailFeign.getSendContactPhone());
-            result.setSendWaitSystem(orderDetailFeign.getSendWaitSystem());
-            result.setSendWaitSystemName(orderDetailFeign.getSendWaitSystemName());
-            result.setSendWaitMode(orderDetailFeign.getSendWaitMode());
-        }
         return result;
     }
 

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

@@ -11,7 +11,6 @@ import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
-import com.clx.order.vo.feign.FeignOrderDetailVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
@@ -164,6 +163,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
         orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
         orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
+        //货源地信息
+        orderGoodsVO.setSendContact(orderInfoFeign.getSendContact());
+        orderGoodsVO.setSendContactPhone(orderInfoFeign.getSendContactPhone());
+        orderGoodsVO.setSendWaitSystem(orderInfoFeign.getSendWaitSystem());
+        orderGoodsVO.setSendWaitSystemName(orderInfoFeign.getSendWaitSystemName());
+        orderGoodsVO.setSendWaitMode(orderInfoFeign.getSendWaitMode());
 
         //获取订单配置的违约金方案
         OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -178,16 +183,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
             orderGoodsVO.setGoodsOrderDetailShow(1);
         }
-        Result<FeignOrderDetailVO> orderDetailFeignResult = orderFeign.getOrderDetail(orderNo);
-        if (orderDetailFeignResult != null && orderDetailFeignResult.getData() != null) {
-            FeignOrderDetailVO orderDetailFeign = orderDetailFeignResult.getData();
-            //货源地信息
-            orderGoodsVO.setSendContact(orderDetailFeign.getSendContact());
-            orderGoodsVO.setSendContactPhone(orderDetailFeign.getSendContactPhone());
-            orderGoodsVO.setSendWaitSystem(orderDetailFeign.getSendWaitSystem());
-            orderGoodsVO.setSendWaitSystemName(orderDetailFeign.getSendWaitSystemName());
-            orderGoodsVO.setSendWaitMode(orderDetailFeign.getSendWaitMode());
-        }
         return orderGoodsVO;
     }