java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
zhaoqiaobo 3 days ago
parent
602a808035 60d6485960
commit
214f78b54d
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

16
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -636,7 +636,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果发货单位没有id值，则把发货单位信息自动添加到client中 //如果发货单位没有id值，则把发货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper); BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper);
if(Objects.isNull(clientEntity)){ if(Objects.isNull(clientEntity)){
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6"); shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}else{ }else{
shipperId = clientEntity.getId(); shipperId = clientEntity.getId();
} }
@ -654,7 +654,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果收货单位没有id值，则把收货单位信息自动添加到client中 //如果收货单位没有id值，则把收货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee); BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee);
if(Objects.isNull(clientEntity)){ if(Objects.isNull(clientEntity)){
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2"); consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}else{ }else{
consigneeId = clientEntity.getId(); consigneeId = clientEntity.getId();
} }
@ -1010,7 +1010,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果发货单位没有id值，则把发货单位信息自动添加到client中 //如果发货单位没有id值，则把发货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper); BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper);
if(Objects.isNull(clientEntity)){ if(Objects.isNull(clientEntity)){
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6"); shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}else{ }else{
shipperId = clientEntity.getId(); shipperId = clientEntity.getId();
} }
@ -1028,7 +1028,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果收货单位没有id值，则把收货单位信息自动添加到client中 //如果收货单位没有id值，则把收货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee); BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee);
if(Objects.isNull(clientEntity)){ if(Objects.isNull(clientEntity)){
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2"); consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}else{ }else{
consigneeId = clientEntity.getId(); consigneeId = clientEntity.getId();
} }
@ -4037,7 +4037,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Long shipperId = openOrderDTO.getShipperId(); Long shipperId = openOrderDTO.getShipperId();
if (Objects.isNull(shipperId)) { if (Objects.isNull(shipperId)) {
//如果发货单位没有id值，则把发货单位信息自动添加到client中 //如果发货单位没有id值，则把发货单位信息自动添加到client中
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6"); shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
} }
waybillEntity.setShipperId(shipperId); waybillEntity.setShipperId(shipperId);
waybillEntity.setShipper(openOrderDTO.getShipper()); waybillEntity.setShipper(openOrderDTO.getShipper());
@ -4048,7 +4048,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id
if (Objects.isNull(consigneeId)) { if (Objects.isNull(consigneeId)) {
//如果收货单位没有id值，则把收货单位信息自动添加到client中 //如果收货单位没有id值，则把收货单位信息自动添加到client中
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2"); consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
} }
waybillEntity.setConsigneeId(consigneeId); waybillEntity.setConsigneeId(consigneeId);
waybillEntity.setConsignee(openOrderDTO.getConsignee()); waybillEntity.setConsignee(openOrderDTO.getConsignee());
@ -5491,7 +5491,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
if(Objects.isNull(newShipperId)){ if(Objects.isNull(newShipperId)){
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newShipper); BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newShipper);
if(Objects.isNull(clientEntity)){ if(Objects.isNull(clientEntity)){
newShipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6"); newShipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}else{ }else{
newShipperId = clientEntity.getId(); newShipperId = clientEntity.getId();
} }
@ -5531,7 +5531,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setServiceType(1); waybillEntity.setServiceType(1);
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newConsignee); BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newConsignee);
if(Objects.isNull(clientEntity)){ if(Objects.isNull(clientEntity)){
newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2"); newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}else{ }else{
newConsigneeId = clientEntity.getId(); newConsigneeId = clientEntity.getId();
waybillEntity.setServiceType(clientEntity.getTypeService()); waybillEntity.setServiceType(clientEntity.getTypeService());

Write Preview
Loading…
Cancel
Save