|
|
@@ -741,7 +741,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- if (ObjectUtil.isNotNull(senderReceiptOrderIds) && !subTransportOrderIds.isEmpty()) {
|
|
|
+ if (ObjectUtil.isNotNull(senderReceiptOrderIds) && !senderReceiptOrderIds.isEmpty()) {
|
|
|
senderReceiptOrderIds.forEach(senderReceiptOrderId -> {
|
|
|
if (ObjectUtil.isNotEmpty(senderReceiptOrderId) && senderReceiptOrderId.length() == 14) {
|
|
|
transportOrderIdSet.add(senderReceiptOrderId.replace("HD", ""));
|
|
|
@@ -827,7 +827,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
houseWaybill.setSubIndex(subTransportOrderVo.getIndex());
|
|
|
houseWaybill.setTemperatureRegion(subTransportOrderVo.getTemperatureRegionText());
|
|
|
|
|
|
- BaseWaybill newBaseWaybill = BeanUtil.copyProperties(houseWaybill, BaseWaybill.class);
|
|
|
+ HouseWaybill newBaseWaybill = BeanUtil.copyProperties(houseWaybill, HouseWaybill.class);
|
|
|
needHideChargeFee(newBaseWaybill, "子单");
|
|
|
|
|
|
houseWaybillList.add(newBaseWaybill);
|