feature(运单):运单详情接口和货单详情接口增加货源地信息

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -230,4 +230,21 @@ public class OrderChildVO {
     @ApiModelProperty("接单保证金 平台服务费费率 弹窗和文案显示 0 不显示  1 显示")
     private Integer goodsOrderDetailShow =  0;
 
+    /* 20240730 增加货源地信息 */
+
+    @ApiModelProperty(value = "货源地现场联系人")
+    private String sendContact;
+
+    @ApiModelProperty(value = "货源地联系人手机号")
+    private String sendContactPhone;
+
+    @ApiModelProperty(value = "发货-是否需要系统排队 0 否  1 是")
+    private Integer sendWaitSystem;
+
+    @ApiModelProperty(value = "发货-排队系统名称")
+    private String sendWaitSystemName;
+
+    @ApiModelProperty(value = "发货-排队系统形式  1:小程序  2:app")
+    private Integer sendWaitMode;
+
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -169,4 +169,21 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("已派单数")
     private Integer dispatchedOrders;
+
+    /* 20240730 增加货源地信息 */
+
+    @ApiModelProperty(value = "货源地现场联系人")
+    private String sendContact;
+
+    @ApiModelProperty(value = "货源地联系人手机号")
+    private String sendContactPhone;
+
+    @ApiModelProperty(value = "发货-是否需要系统排队 0 否  1 是")
+    private Integer sendWaitSystem;
+
+    @ApiModelProperty(value = "发货-排队系统名称")
+    private String sendWaitSystemName;
+
+    @ApiModelProperty(value = "发货-排队系统形式  1:小程序  2:app")
+    private Integer sendWaitMode;
 }
\ No newline at end of file

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

@@ -8,6 +8,7 @@ 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;
@@ -1731,6 +1732,18 @@ 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,6 +11,7 @@ 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;
@@ -177,7 +178,16 @@ 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;
     }