Merge branch 'dev'

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

@@ -259,6 +259,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.MonthDay;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -2488,8 +2490,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			YearMonth parse1 = YearMonth.parse(distributionDeliveryList.getTaskTime_end(), DateTimeFormatter.ISO_DATE);
 			long until = parse.until(parse1, ChronoUnit.MONTHS);
 			if (until != 0) {
-				log.error(method + "列表搜索时间范围大于一个月");
-				return Resp.fail("最大区间为一个月,请缩小搜索范围");
+				LocalDate day1 = LocalDate.parse(distributionDeliveryList.getTaskTime_start());
+				LocalDate day2 = LocalDate.parse(distributionDeliveryList.getTaskTime_end());
+				long between = ChronoUnit.DAYS.between(day1, day2);
+				if (between > 30){
+					log.error(method + "列表搜索时间范围大于三十天");
+					return Resp.fail("最大区间为三十天,请缩小搜索范围");
+				}
+
 			}
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			distributionDeliveryList.setWarehouseId(myCurrentWarehouse.getId());

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

@@ -125,6 +125,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -8396,8 +8397,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		YearMonth parse1 = YearMonth.parse(distributionDeliveryList.getTaskTime_end(), DateTimeFormatter.ISO_DATE);
 		long until = parse.until(parse1, ChronoUnit.MONTHS);
 		if (until != 0) {
-			log.error(method + "列表搜索时间范围大于一个月");
-			return Resp.fail("最大区间为一个月,请缩小搜索范围");
+			LocalDate day1 = LocalDate.parse(distributionDeliveryList.getTaskTime_start());
+			LocalDate day2 = LocalDate.parse(distributionDeliveryList.getTaskTime_end());
+			long between = ChronoUnit.DAYS.between(day1, day2);
+			if (between > 30){
+				log.error(method + "列表搜索时间范围大于三十天");
+				return Resp.fail("最大区间为三十天,请缩小搜索范围");
+			}
 		}
 
 		distributionDeliveryList.setWarehouseId(myCurrentWarehouse.getId());

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java

@@ -109,6 +109,9 @@ public class PackageFanoutListener {
 			});
 			statisticsDistributionPackageService.updateBatchById(statisticsDistributionList);
 
+			if(orderInfoSet.isEmpty()){
+				return ;
+			}
 			List<StatisticsDistributionPackageEntity> statisticsList = statisticsDistributionPackageService.findListByOrderInfoSet(orderInfoSet);
 			// 把statisticsList通过元素的orderInfoId进行map分组
 			Map<Long, List<StatisticsDistributionPackageEntity>> groupedStatisticsList = statisticsList.stream()

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -47,6 +47,7 @@
         from logpm_statistics_order_info lsoi
         left join logpm_basicdata_client lbc on lbc.id = lsoi.consignee_id
         left join logpm_warehouse_waybill lww on lww.id = lsoi.waybill_id
+        LEFT JOIN logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id=lww.id
         where 1=1
         and lsoi.create_reconciliation_order_status = 0
         <if test="param.listType == 1">

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -462,7 +462,6 @@
         lww.waybill_status waybillStatus,
         lww.waybill_type waybillType,
         lww.document_making_time openTime,
-        lww.goods_name goodsName,
         lww.total_count totalCount,
         sum(lwwd.weight) totalWeight,
         sum(lwwd.volume) totalVolume,
@@ -489,6 +488,7 @@
         lww.claiming_value claimingValue,
         lww.third_operation_fee thirdOperationFee,
         lww.rebate rebate,
+        group_concat(concat(lwwd.product_name )) AS goodsName,
         GROUP_CONCAT(concat(lwwd.num)) goodsTypeNum,
         GROUP_CONCAT(concat(lwwd.price)) goodsTypePrice,
         GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.delivery_price,0),')')) goodsTypeDeliveryPrice,