Merge branch 'dev' into dist.1.2.0

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -1699,6 +1699,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					.map(DistributionParcelListEntity::getOrderCode)
 					.distinct().collect(Collectors.joining(","));
 				log.info(method + "维护订制品订单:{}", orderCodes);
+				if(Func.isNotEmpty(builder)){
+					builder.append(",");
+				}
 				builder.append(orderCodes);
 
 				log.info(">>>>>> updatePackageDeliveryStatus,{}, {}", reservationId, packageIds);
@@ -1740,6 +1743,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					if (Func.isNotEmpty(collect)) {
 						String orderCode = distributionParcelNumberDTOS.stream().filter(f -> collect.contains(f.getParcelListId())).map(DistributionParcelNumberDTO::getOrderCode).collect(Collectors.joining(","));
 						log.info(method + "维护零担订单:{}", orderCode);
+						if(Func.isNotEmpty(builder)){
+							builder.append(",");
+						}
 						builder.append(orderCode);
 						//这些单子就是需要进行状态回退的零担包件
 						reservationZeroPackageService.recoverZeroPackage(reservationId, collect);
@@ -1748,6 +1754,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					//计划数量全部回退
 					String orderCode = distributionParcelNumberDTOS.stream().map(DistributionParcelNumberDTO::getOrderCode).distinct().collect(Collectors.joining(","));
 					log.info(method + "维护零担订单:{}", orderCode);
+					if(Func.isNotEmpty(builder)){
+						builder.append(",");
+					}
 					builder.append(orderCode);
 					reservationZeroPackageService.recoverZeroPackage(reservationId, packageIds);
 				}