|
@@ -409,12 +409,12 @@ public class UplodeUtil {
|
|
.eq("common_id",orderInfo.getCommonId()));
|
|
.eq("common_id",orderInfo.getCommonId()));
|
|
if (hyDriverInfo!=null){
|
|
if (hyDriverInfo!=null){
|
|
carrierInfoDTO.put("driverIdCard", hyDriverInfo.getNumberCard());
|
|
carrierInfoDTO.put("driverIdCard", hyDriverInfo.getNumberCard());
|
|
- carrierInfoDTO.put("carrierIdCard", orderInfo.getSendPrivate());
|
|
|
|
|
|
+ carrierInfoDTO.put("carrierIdCard", hyDriverInfo.getNumberCard());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
carrierInfoDTO.put("carLicensePlate", orderInfo.getCarNumber());
|
|
carrierInfoDTO.put("carLicensePlate", orderInfo.getCarNumber());
|
|
carrierInfoDTO.put("carrierTransportCost", orderInfo.getFreight());
|
|
carrierInfoDTO.put("carrierTransportCost", orderInfo.getFreight());
|
|
- carrierInfoDTO.put("oilCardPayment", 0);
|
|
|
|
|
|
+ carrierInfoDTO.put("oilCardPaymenet", 0);
|
|
carrierInfoDTO.put("prePayment", orderInfo.getAdvanceCharge());
|
|
carrierInfoDTO.put("prePayment", orderInfo.getAdvanceCharge());
|
|
carrierInfoDTO.put("arrivePayment",0);
|
|
carrierInfoDTO.put("arrivePayment",0);
|
|
carrierInfoDTO.put("receiptPayment", 0);
|
|
carrierInfoDTO.put("receiptPayment", 0);
|