1.推送零担订单逻辑修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -915,6 +915,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		advanceEntity.setWaybillStatus("0");
 		advanceEntity.setFreezeStatus("0");
 		advanceEntity.setLegacyStatus("0");
+		advanceEntity.setCreateUserName(AuthUtil.getNickName());
 		advanceService.save(advanceEntity);
 		Long advanceId = advanceEntity.getId();
 
@@ -1019,6 +1020,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceEntity.setWaybillStatus("0");
 				advanceEntity.setFreezeStatus("0");
 				advanceEntity.setLegacyStatus("0");
+				advanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(advanceEntity);
 			}else{
 				Long advanceId = advanceEntity.getId();
@@ -1150,7 +1152,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
 				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importCustomizedOuPaiDTO.getDueDateStr()));
-				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName());
+				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(trunklineAdvanceEntity);
 			}else{
 				Long advanceId = trunklineAdvanceEntity.getId();
@@ -1260,7 +1262,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
 				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importStandardOuPaiDTO.getDueDateStr()));
-				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName());
+				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(trunklineAdvanceEntity);
 			}else{
 				Long advanceId = trunklineAdvanceEntity.getId();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -188,8 +188,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				distributionStockArticleEntity.setWaybillId(warehouseWaybill.getId());
 				distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 				distributionStockArticleEntity.setMallName(consignee);
-				distributionStockArticleEntity.setMallCode(clientEntity.getClientCode());
+				if(!Objects.isNull(clientEntity)){
-				distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId());
+					distributionStockArticleEntity.setMallName(clientEntity.getClientName());
+					distributionStockArticleEntity.setMallCode(clientEntity.getClientCode());
+					distributionStockArticleEntity.setMallId(clientEntity.getId());
+				}
 				distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName());
 				distributionStockArticleEntity.setWarehouse(basicdataWarehouseEntity.getName());
 				distributionStockArticleEntity.setWarehouseEntryTime(date);