同步运单

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildDriverInfoDTO.java

@@ -98,6 +98,6 @@ public class OrderChildDriverInfoDTO {
     private String licenceIssueOrganization;
     @ApiModelProperty(value = "身份证住址", required = true)
     @NotBlank(message = "身份证住址不能为空")
-    private String idCardAddress;
+    private String idCardAddress = "手动";
 
 }

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildBrokerParam.java

@@ -35,7 +35,7 @@ public class ThirdOrderChildBrokerParam {
     private Integer freightNoCard;
     @ApiModelProperty(value = "溢价金额", dataType = "Integer", required = true)
     @NotNull(message = "溢价金额不能为空")
-    private Integer orderChildBrokerBeyondFreight;
+    private Integer orderChildBrokerBeyondFreight = 0;
     @ApiModelProperty(value = "净重", dataType="BigDecimal", required = true)
     @NotNull(message = "净重不能为空")
     private BigDecimal net;
@@ -73,7 +73,7 @@ public class ThirdOrderChildBrokerParam {
     private String receiveCounty;
     @ApiModelProperty(value = "收货人所在乡镇", dataType="String", required = true)
     @NotBlank(message = "收货人所在乡镇不能为空")
-    private String receiveTown;
+    private String receiveTown = "手动";
     @ApiModelProperty(value = "收货地址", dataType="String", required = true)
     @NotBlank(message = "收货地址不能为空")
     private String receiveAddress;

performance-web/src/main/java/com/clx/performance/controller/pc/OrderCancelController.java

@@ -5,11 +5,13 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.param.pc.ArtificialCancelOrderParam;
@@ -60,6 +62,9 @@ public class OrderCancelController {
     @Autowired
     private TransportFeignService transportFeignService;
 
+    @Autowired
+    private SettlementDriverDetailDao settlementDriverDetailDao;
+
     @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/platformCancelOrderPre")
     public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
@@ -102,8 +107,9 @@ public class OrderCancelController {
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).get();
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail);
+        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
         log.info("=======================生成Param{}", JSONUtil.parse(param));
         String result = transportFeignService.orderChildSync(param);
         return Result.ok(result);

performance-web/src/main/java/com/clx/performance/service/TransportSyncService.java

@@ -2,10 +2,13 @@ package com.clx.performance.service;
 
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 
 public interface TransportSyncService {
 
-    ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail);
+    ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
+    SettlementDriverDetail settlementDriverDetail
+    );
 }

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

 package com.clx.performance.service.impl;
 
+import cn.hutool.json.JSON;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.AddressFeign;
 import com.clx.order.feign.OrderFeign;
@@ -47,14 +48,14 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     private final GdService gdService;
 
     @Override
-    public ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail) {
+    public ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,SettlementDriverDetail settlementDriverDetail) {
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
         ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
         FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
         FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
         FeignAddressVO.Address sendAddress = data.getSendAddress();
         //生成基础参数
-        generateBaseInfo(orderChild, orderGoods, param, sendAddress, receiveAddress, orderInfoFeign, settlementOwnerDetail);
+        generateBaseInfo(orderChild, orderGoods, param, sendAddress, receiveAddress, orderInfoFeign, settlementOwnerDetail,settlementDriverDetail);
         //生成货单数据
         generateOrderGoods(orderGoods, orderChild, sendAddress, receiveAddress, param);
         //生成车辆信息
@@ -103,12 +104,15 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     private void generateBaseInfo(OrderChild orderChild, OrderGoods orderGoods, ThirdOrderChildBrokerParam param,
                                   FeignAddressVO.Address sendAddress,
                                   FeignAddressVO.Address receiveAddress, FeignOrderVO orderInfoFeign,
-                                  SettlementOwnerDetail settlementOwnerDetail
+                                  SettlementOwnerDetail settlementOwnerDetail,
+                                  SettlementDriverDetail settlementDriverDetail
     ) {
         param.setChildNo(orderChild.getChildNo());
+        param.setTruckNo(orderChild.getTruckNo());
         param.setFreightPrice(Integer.valueOf(orderChild.getFreightPrice().toString()));
         param.setFreight(Integer.valueOf(orderChild.getFreight().toString()));
 
+        param.setNet(orderChild.getUnloadNet());
         param.setSendAddress(orderGoods.getSendAddressShorter());
         param.setSendProvince(sendAddress.getProvince());
         param.setSendCity(sendAddress.getCity());
@@ -116,7 +120,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         param.setSendTown(sendAddress.getTown());
         param.setSendName(sendAddress.getContact());
         param.setSendMobile(sendAddress.getContactPhone());
-
+        param.setFreightNoCard(settlementDriverDetail.getSettlementFreight().intValue());
         param.setReceiveAddress(orderChild.getReceiveAddress());
         param.setReceiveProvince(receiveAddress.getProvince());
         param.setReceiveCity(receiveAddress.getCity());
@@ -195,6 +199,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     //车辆信息
     public void generateTruckInfo(OrderChild orderChild, ThirdOrderChildBrokerParam param) {
         TruckInfoFeignVo truckInfoFeignVo = truckFeign.getTruckInfo(orderChild.getTruckId()).getData();
+        log.info("++++++++++++++++++++++++++++++++++++++++++++++++++truckInfoFeignVo++++++++++++++++" + JSONUtil.parse(truckInfoFeignVo));
         OrderChildTruckInfoDTO truckInfoDTO = new OrderChildTruckInfoDTO();
         DriverInfoFeignVo ownerInfo = driverFeign.getDriverInfo(orderChild.getTruckOwnUserNo()).getData();
         truckInfoDTO.setMobile(ownerInfo.getMobile());
@@ -205,7 +210,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         truckInfoDTO.setGrossMass(truckInfoFeignVo.getGrossMass() == null ? null : truckInfoFeignVo.getGrossMass().intValue());
         truckInfoDTO.setRoadTransportCertificateNo(truckInfoFeignVo.getRoadTransportCertificateNo());
         truckInfoDTO.setLicenceImgMain(truckInfoFeignVo.getLicenceImgMain());
-        truckInfoDTO.setLicenceImgSecond(truckInfoFeignVo.getLicenceImgSecond2());
+        truckInfoDTO.setLicenceImgSecond(truckInfoFeignVo.getLicenceImgSecond());
         truckInfoDTO.setLicenceImgSecondBack(truckInfoFeignVo.getLicenceImgSecondBack());
         truckInfoDTO.setTransportLicenceImg(truckInfoFeignVo.getTransportLicenceImg());
         if (StringUtils.isNotBlank(truckInfoFeignVo.getPowerType())) {
@@ -240,7 +245,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setLicenceImg(licenceVO.getLicenceImg());
         dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
         dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
-        dto.setLicenceEndTime(licenceVO.getLicenceEndTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get());
+        dto.setLicenceEndTime(licenceVO.getLicenceEndTime() == null ? "2099-12-31 00:00:00" : DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get());
         dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
         dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
         dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
@@ -269,7 +274,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setLicenceImg(licenceVO.getLicenceImg());
         dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
         dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
-        dto.setLicenceEndTime(licenceVO.getLicenceEndTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get());
+        dto.setLicenceEndTime(licenceVO.getLicenceEndTime() == null ? "2099-12-31 00:00:00" : DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get());
         dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
         dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
         dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
@@ -313,6 +318,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
 
     public void generateRouteList(GdRouteDTO gdRouteDTO, ThirdOrderChildBrokerParam param) {
         List<OrderChildTruckTraceDTO> list = new LinkedList<>();
+        log.info("轨迹我"+ JSONUtil.parse(gdRouteDTO));
         for (int i = 0; i < gdRouteDTO.getPosList().size(); i++) {
             if (i == 6) {
                 OrderChildTruckTraceDTO dto = new OrderChildTruckTraceDTO();