承运与无车承运对接

performance-api/src/main/java/com/clx/performance/feign/BrokerFeign.java

+package com.clx.performance.feign;
+
+import com.clx.performance.vo.pc.broker.TransportParam;
+import com.msl.common.result.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@FeignClient(name = "broker-service",configuration = PerformanceClientConfiguration.class,url = "${settlement.brokerHost}")
+public interface BrokerFeign {
+
+    /**
+     * 运单同步
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/broker-service/open/transport/saveTransport")
+    Result<String> saveTransport(@RequestBody TransportParam param);
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOrderChildDTO {
+
+    private String sourceChildNo;
+    @ApiModelProperty(value = "源货单编号", example = "1234", required = true, dataType = "String")
+    private String sourceGoodsNo;
+    @ApiModelProperty(value = "源订单编号", example = "1234", required = true, dataType = "String")
+    private String sourceOrderNo;
+    @ApiModelProperty(value = "源结算单编号", example = "1234", required = true, dataType = "String")
+    private String sourceSettlementNo;
+
+    @ApiModelProperty(value = "运费单价（分/吨）", example = "162", required = true, dataType = "Integer")
+    private Integer freightPrice;
+    @ApiModelProperty(value = "运费（分）", example = "162", required = true, dataType = "Integer")
+    private Integer freight;
+    @ApiModelProperty(value = "司机运费（分）",  example = "123", dataType = "Integer")
+    private Integer driverFreight;
+    @ApiModelProperty(value = "司机运费单价（分/吨）",  example = "123", dataType = "Integer")
+    private Integer driverFreightPrice;
+    @ApiModelProperty(value = "开票金额（分）", example = "162", required = true, dataType = "Integer")
+    private Integer invoiceFreight;
+    @ApiModelProperty(value = "亏吨扣款（分）",  example = "123", dataType = "Integer")
+    private Integer lossFee;
+    @ApiModelProperty(value = "货损单价（分/吨）",  example = "123", dataType = "Integer")
+    private Integer lossFeePrice;
+
+    @ApiModelProperty(value = "发货皮重（吨）")
+    private BigDecimal sendTare;
+    @ApiModelProperty(value = "发货毛重（吨）")
+    private BigDecimal sendRough;
+    @ApiModelProperty(value = "发货净重（吨）")
+    private BigDecimal sendNet;
+
+    @ApiModelProperty(value = "接单时间")
+    private String payTime;
+    @ApiModelProperty(value = "装车时间")
+    private String loadTime;
+    @ApiModelProperty(value = "卸车时间")
+    private String unloadTime;
+    @ApiModelProperty(value = "运单完成时间", example = "2020-02-02 10:10:10", required = true, dataType = "String")
+    private String payFinishedTime;
+
+    @ApiModelProperty(value = "收货皮重（吨）")
+    private BigDecimal receiveTare;
+    @ApiModelProperty(value = "收货毛重（吨）")
+    private BigDecimal receiveRough;
+    @ApiModelProperty(value = "收货净重（吨）")
+    private BigDecimal receiveNet;
+
+    @ApiModelProperty(value = "备注", example = "", required = true, dataType = "String")
+    private String remark;
+
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOrderChildDriverDTO {
+
+    @ApiModelProperty(value = "手机号", dataType="String")
+    private String mobile;
+    @ApiModelProperty(value = "姓名", dataType="String")
+    private String name;
+    @ApiModelProperty(value = "性别1男2女", dataType="Integer")
+    private Integer sex;
+    @ApiModelProperty(value = "头像相对地址", dataType="String")
+    private String headImg;
+    @ApiModelProperty(value = "身份证号", dataType="String")
+    private String cardNo;
+    @ApiModelProperty(value = "身份证住址")
+    private String idCardAddress;
+    @ApiModelProperty(value = "身份证有效期起始时间", dataType="String")
+    private String cardStartTime;
+    @ApiModelProperty(value = "身份证有效期终止时间", dataType="String")
+    private String cardEndTime;
+    @ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer")
+    private Integer cardLongTerm;
+    @ApiModelProperty(value = "身份证正面图片地址", dataType="String")
+    private String cardFrontImg;
+    @ApiModelProperty(value = "身份证背面图片地址", dataType="String")
+    private String cardBackImg;
+    @ApiModelProperty(value = "手持身份证照片地址", dataType="String")
+    private String faceCardImg;
+    @ApiModelProperty(value = "驾驶证号码", dataType="String")
+    private String licenceNo;
+    @ApiModelProperty(value = "驾驶证发证机关")
+    private String licenceIssueOrganization;
+    @ApiModelProperty(value = "初次领证日期", dataType="String")
+    private String licenseTime;
+    @ApiModelProperty(value = "驾照类型", dataType="String")
+    private String licenceClass;
+    @ApiModelProperty(value = "驾驶证正面图片", dataType="String")
+    private String licenceImg;
+    @ApiModelProperty(value = "驾驶证背面图片", dataType="String")
+    private String licenceBackImg;
+    @ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String")
+    private String licenceStartTime;
+    @ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String")
+    private String licenceEndTime;
+    @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String")
+    private String transportLicenceImg;
+    @ApiModelProperty(value = "道路运输从业资格证号", dataType="String")
+    private String occupationalLicenceNo;
+    @ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String")
+    private String occupationalLicenceImg;
+    @ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String")
+    private String occupationalStartTime;
+    @ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String")
+    private String occupationalEndTime;
+
+    @ApiModelProperty(value = "银行卡卡号", example = "", required = true, dataType = "String")
+    private String bankCardNo;
+    @ApiModelProperty(value = "银行预留手机号", example = "", required = true, dataType = "String")
+    private String bankMobile;
+    @ApiModelProperty(value = "银行名称", example = "", required = true, dataType = "String")
+    private String bankName;
+
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOrderChildImageDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "图片类型", example = "2: 装车磅单照片 21：收货过磅单", required = true, dataType = "Integer")
+    private Integer type;
+    @ApiModelProperty(value = "图片相对地址", example = "", required = true, dataType = "String")
+    private String image;
+
+    public OpenOrderChildImageDTO(Integer type, String image) {
+        this.type = type;
+        this.image = image;
+    }
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOrderChildTruckDTO {
+
+    @ApiModelProperty(value = "车牌号", dataType="String")
+    private String truckNo;
+    @ApiModelProperty(value = "车头车牌颜色代码", dataType="Integer")
+    private Integer truckNoColorCode;
+    @ApiModelProperty(value = "车头车牌颜色", dataType="String")
+    private String truckNoColor;
+    @ApiModelProperty(value = "型号", dataType="String")
+    private String model;
+    @ApiModelProperty(value = "载重单位吨", dataType="Integer")
+    private Integer load;
+    @ApiModelProperty(value = "吨位 单位吨", dataType="Integer")
+    private Integer grossMass;
+    @ApiModelProperty(value = "车辆识别代码")
+    private String identifyCode;
+    @ApiModelProperty(value = "使用性质")
+    private String useNature;
+    @ApiModelProperty(value = "注册日期")
+    private String registerDate;
+    @ApiModelProperty(value = "行驶证发证机关")
+    private String licenceIssueOrganization;
+    @ApiModelProperty(value = "行驶证发证日期")
+    private String licenceIssueDate;
+    @ApiModelProperty(value = "业户名称")
+    private String businessName;
+    @ApiModelProperty(value = "道路运输经营许可证号")
+    private String roadTransportPermitNumber;
+
+    @ApiModelProperty(value = "挂车第二个车牌号")
+    private String truckNo2;
+    @ApiModelProperty(value = "车头道路运输许可证编号", dataType="String")
+    private String roadTransportCertificateNo;
+    @ApiModelProperty(value = "行驶证主页照片", dataType="String")
+    private String licenceImgMain;
+    @ApiModelProperty(value = "行驶证副业正面照片", dataType="String")
+    private String licenceImgSecond;
+    @ApiModelProperty(value = "行驶证副业背面照片", dataType="String")
+    private String licenceImgSecondBack;
+    @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String")
+    private String transportLicenceImg;
+    @ApiModelProperty(value = "车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电", dataType="Integer")
+    private Integer powerType;
+
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOrderChildTruckOwnerDTO {
+
+    @ApiModelProperty(value = "手机号", dataType="String")
+    private String mobile;
+    @ApiModelProperty(value = "姓名", dataType="String")
+    private String name;
+    @ApiModelProperty(value = "性别1男2女", dataType="Integer")
+    private Integer sex;
+    @ApiModelProperty(value = "头像相对地址", dataType="String")
+    private String headImg;
+    @ApiModelProperty(value = "身份证号", dataType="String")
+    private String cardNo;
+    @ApiModelProperty(value = "身份证住址")
+    private String idCardAddress;
+    @ApiModelProperty(value = "身份证有效期起始时间", dataType="String")
+    private String cardStartTime;
+    @ApiModelProperty(value = "身份证有效期终止时间", dataType="String")
+    private String cardEndTime;
+    @ApiModelProperty(value = "是否是长期 0-非长期 1-长期", dataType="Integer")
+    private Integer cardLongTerm;
+    @ApiModelProperty(value = "身份证正面图片地址", dataType="String")
+    private String cardFrontImg;
+    @ApiModelProperty(value = "身份证背面图片地址", dataType="String")
+    private String cardBackImg;
+    @ApiModelProperty(value = "手持身份证照片地址", dataType="String")
+    private String faceCardImg;
+
+    @ApiModelProperty(value = "银行卡卡号", example = "", required = true, dataType = "String")
+    private String bankCardNo;
+    @ApiModelProperty(value = "银行预留手机号", example = "", required = true, dataType = "String")
+    private String bankMobile;
+    @ApiModelProperty(value = "银行名称", example = "", required = true, dataType = "String")
+    private String bankName;
+
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OpenOrderDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "货单编号", example = "12020083116861267", required = true, dataType = "String")
+    private String sourceOrderNo;
+
+    @ApiModelProperty(value = "发布货源时间", example = "2023-01-01 00:00:00", required = true, dataType = "String")
+    private String publishTime;
+    @ApiModelProperty(value = "最晚装货时间", example = "2023-01-01 00:00:00", required = true, dataType = "String")
+    private String extractTime;
+    @ApiModelProperty(value = "司机最晚到达时间", example = "2023-01-01 00:00:00", required = true, dataType = "String")
+    private String arriveTime;
+
+    @ApiModelProperty(value = "总货物数量", example = "32.12", required = true, dataType = "String")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty(value = "货物名称", example = "原煤", required = true, dataType = "String")
+    private String goodsName;
+    @ApiModelProperty(value = "货物运费单价（分）", example = "3212", required = true, dataType = "Integer")
+    private Integer transPrice;
+    @ApiModelProperty(value = "货物价值（分）", example = "3212", required = true, dataType = "Integer")
+    private Integer goodsPrice;
+
+    @ApiModelProperty(value = "发货单位", example = "发货单位", required = true, dataType = "String")
+    private String sendCompany;
+    @ApiModelProperty(value = "货源所在详细地址", example = "货源所在详细地址", required = true, dataType = "String")
+    private String sendAddress;
+    @ApiModelProperty(value = "发货人姓名", example = "张三", required = true, dataType = "String")
+    private String sendName;
+    @ApiModelProperty(value = "收货人所在详细地址", example = "收货人所在详细地址", required = true, dataType = "String")
+    private String receiveAddress;
+    @ApiModelProperty(value = "收货单位", example = "收货单位", required = true, dataType = "String")
+    private String receiveCompany;
+    @ApiModelProperty(value = "收货人姓名", example = "张三", required = true, dataType = "String")
+    private String receiveName;
+
+    @ApiModelProperty(value = "发货所在省份", required = true)
+    private String sendProvince;
+    @ApiModelProperty(value = "发货所在城市", required = true)
+    private String sendCity;
+    @ApiModelProperty(value = "发货所在区县", required = true)
+    private String sendCounty;
+    @ApiModelProperty(value = "发货所在乡镇", required = true)
+    private String sendTown;
+    @ApiModelProperty(value = "发货联系人手机号", required = true)
+    private String sendMobile;
+    @ApiModelProperty(value = "发货地址经度", required = true)
+    private String loadLongitude;
+    @ApiModelProperty(value = "发货地址纬度", required = true)
+    private String loadLatitude;
+    @ApiModelProperty(value = "收货人所在省", required = true)
+    private String receiveProvince;
+    @ApiModelProperty(value = "收货人所在城市", required = true)
+    private String receiveCity;
+    @ApiModelProperty(value = "收货人所在区县", required = true)
+    private String receiveCounty;
+    @ApiModelProperty(value = "收货人所在乡镇", required = true)
+    private String receiveTown;
+    @ApiModelProperty(value = "收货联系人手机号", required = true)
+    private String receiveMobile;
+    @ApiModelProperty(value = "收货地址经度", required = true)
+    private String unloadLongitude;
+    @ApiModelProperty(value = "收货地址纬度", required = true)
+    private String unloadLatitude;
+
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class TransportParam {
+
+    @ApiModelProperty(value = "用户编号", required = true)
+    @NotNull(message = "用户编号不能为空")
+    private String userCode;
+
+    @ApiModelProperty(value = "网络货运平台编码", example = "123", required = true, dataType = "String")
+    @NotBlank(message = "网络货运平台编码不能为空")
+    private String transportPlatformCode;
+
+    @ApiModelProperty(value = "货主手机号（货主账号）", example = "", required = true, dataType = "String")
+    @NotBlank(message = "货主手机号（货主账号）不能为空")
+    private String ownerMobile;
+
+    @ApiModelProperty(value = "运单编号", required = true)
+    @NotBlank(message = "运单编号不能为空")
+    private String orderCode;
+
+    @ApiModelProperty(value = "货单", required = true)
+    @NotNull(message = "货单不能为空")
+    private OpenOrderDTO orderInfo;
+
+    @ApiModelProperty(value = "图片", required = true)
+    @NotEmpty(message = "运单图片不能为空")
+    private List<OpenOrderChildImageDTO> imageList;
+
+    @ApiModelProperty(value = "司机", required = true)
+    @NotNull(message = "司机不能为空")
+    private OpenOrderChildDriverDTO driverInfo;
+
+    @ApiModelProperty(value = "车主", required = true)
+    @NotNull(message = "车主不能为空")
+    private OpenOrderChildTruckOwnerDTO ownerInfo;
+
+    @ApiModelProperty(value = "车辆", required = true)
+    @NotNull(message = "车辆不能为空")
+    private OpenOrderChildTruckDTO truckInfo;
+
+    @ApiModelProperty(value = "运单", required = true)
+    @NotNull(message = "运单不能为空")
+    private OpenOrderChildDTO orderChildInfo;
+
+}

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

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class TransportVO {
+
+    @ApiModelProperty(value = "源运单编号", example = "1234", required = true, dataType = "String")
+    private String sourceChildNo;
+    @ApiModelProperty(value = "运单编号", example = "1234", required = true, dataType = "String")
+    private String childNo;
+
+    @ApiModelProperty(value = "风控状态 0-正常，1-单项异常，2-多项异常", example = "1", dataType = "Integer")
+    private Integer riskStatus;
+    @ApiModelProperty(value = "风控异常原因", example = "1", dataType = "String")
+    private String riskReason;
+
+    @ApiModelProperty(value = "同步状态 0-未同步，1-已同步，2-同步失败", example = "1", dataType = "Integer")
+    private Integer syncStatus;
+    @ApiModelProperty(value = "同步失败原因", example = "1", dataType = "String")
+    private String syncMsg;
+
+    @ApiModelProperty(value = "结算状态 0 未结算 1 已结算 2结算中 ", example = "1234124", dataType = "String")
+    private Integer settleStatus;
+    @ApiModelProperty(value = "结算方", example = "1", dataType = "String")
+    private Integer settleOrg;
+    @ApiModelProperty(value = "结算失败原因", example = "1", dataType = "String")
+    private String settleMsg;
+
+    @ApiModelProperty(value = "开票状态 0 未开票 1 已开票 ", example = "1234124", dataType = "String")
+    private Integer invoiceStatus;
+
+
+}

performance-web/src/main/java/com/clx/performance/config/SettlementConfig.java

@@ -9,11 +9,12 @@ import org.springframework.stereotype.Component;
 @Component
 public class SettlementConfig {
 
-    // 普通单开票公司
-    private InvoiceCompany invoiceCompanyDefault;
+    // broker host
+    private String brokerHost;
+    // broker用户编号
+    private String brokerUserCode;
+
+    // 普通单开票公司编号
+    private String ordinaryInvoiceCompanyGroupCode;
 
-    @Data
-    public class InvoiceCompany {
-        String companyGroupCode;
-    }
 }

performance-web/src/main/java/com/clx/performance/extranal/broker/BrokerService.java

+package com.clx.performance.extranal.broker;
+
+import com.clx.performance.vo.pc.broker.TransportParam;
+
+public interface BrokerService {
+
+    void orderChildSync(TransportParam param);
+}

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

+package com.clx.performance.extranal.broker.impl;
+
+import com.clx.performance.extranal.broker.BrokerService;
+import com.clx.performance.feign.BrokerFeign;
+import com.clx.performance.vo.pc.broker.TransportParam;
+import com.msl.common.result.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class BrokerServiceImpl implements BrokerService {
+    @Autowired
+    public BrokerFeign brokerFeign;
+
+    @Override
+    public void orderChildSync(TransportParam param) {
+
+        Result<String> result = brokerFeign.saveTransport(param);
+        if (result.getCode() != 0) {
+            log.info("运单同步网络货运失败, msg:{}", result.getMsg());
+        }
+    }
+}

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -27,6 +27,7 @@ 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.service.TransportSyncService;
+import com.clx.performance.service.broker.OrderChildSyncBrokerService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import com.msl.common.dto.HttpDTO;
 import lombok.AllArgsConstructor;
@@ -72,6 +73,7 @@ public class OrderChildSyncTransportListener {
     private final ApplicationEventPublisher applicationEventPublisher;
     private final InvoicingCompanyService invoicingCompanyService;
     private final SettlementConfig settlementConfig;
+    private final OrderChildSyncBrokerService orderChildSyncBrokerService;
 
     /**
      * 承运同步网络货运运单
@@ -102,14 +104,17 @@ public class OrderChildSyncTransportListener {
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
-        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+//        // 同步网络货运
+//        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+//        HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
+//        String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
+//        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
+//        extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
 
-        // 同步网络货运
-        HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
-        String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
-        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
+        // 同步broker
+        orderChildSyncBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 
-        extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
+//        extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
     }
 
     public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,
@@ -190,7 +195,7 @@ public class OrderChildSyncTransportListener {
             settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
 
             InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
-                    settlementConfig.getInvoiceCompanyDefault().getCompanyGroupCode());
+                    settlementConfig.getOrdinaryInvoiceCompanyGroupCode());
             //设置开票公司信息
             settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());

performance-web/src/main/java/com/clx/performance/service/broker/OrderChildSyncBrokerService.java

+package com.clx.performance.service.broker;
+
+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;
+
+public interface OrderChildSyncBrokerService {
+
+    void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
+                        SettlementDriverDetail settlementDriverDetail);
+}

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

@@ -81,9 +81,6 @@ public class SettlementServiceImpl implements SettlementService {
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-
         if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) <= 0) {
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
@@ -105,7 +102,7 @@ public class SettlementServiceImpl implements SettlementService {
             settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
 
             InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
-                    settlementConfig.getInvoiceCompanyDefault().getCompanyGroupCode());
+                    settlementConfig.getOrdinaryInvoiceCompanyGroupCode());
             //设置开票公司信息
             settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
@@ -131,6 +128,9 @@ public class SettlementServiceImpl implements SettlementService {
         settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+
         log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);