fix:修复预结算明细品类错误问题

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/WaybillDetailByWaybillNoVo.java

@@ -2,6 +2,8 @@ package com.logpm.statistics.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class WaybillDetailByWaybillNoVo {
 
@@ -11,9 +13,43 @@ public class WaybillDetailByWaybillNoVo {
 	private Long waybillId;
 
 	/**
-	 * 凭借的产品数量
+	 * 运单号
-	 * @Detail 木门(3),木门配件(17)
+	 */
+	private String waybillNo;
+
+	/**
+	 *  产品ID
+	 */
+	private String productId;
+
+	/**
+	 * 产品名称
+	 */
+	private String productName;
+
+	/**
+	 * 运单产婆开单数量
+	 */
+	private Integer num;
+
+	/**
+	 * 体积
+	 */
+	private BigDecimal volume;
+
+	/**
+	 * 重量
+	 */
+	private BigDecimal weight;
+
+	/**
+	 * 单价
+	 */
+	private BigDecimal price;
+
+	/**
+	 * 小计
 	 */
-	private String goodsName;
+	private String subtotalFreight;
 
 }

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

@@ -18,11 +18,6 @@
         lww.consignee_name consigneePerson,
         lww.consignee_mobile consigneeMobile,
         lww.consignee_address consigneeAddress,
-        concat(GROUP_CONCAT(lwwd.product_name)) as goodsName,
-        concat(
-        group_concat( lwwd.num )) AS goodsNum,
-        concat(
-        group_concat( lwwd.price )) AS goodsPrice,
         lsoi.sign_status signStatus,
         lsoi.sign_date signDate,
         lww.create_time openTime,
@@ -47,7 +42,6 @@
         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">
@@ -462,6 +456,7 @@
     <select id="findPackageListByOrderIdsGroupById" resultType="com.logpm.statistics.vo.StatisticsPackageFeeInfoVO">
         select
         lstp.order_info_id orderInfoId,
+        GROUP_CONCAT(DISTINCT lswp.product_name ORDER BY lswp.product_name) goodsName,
         IFNULL(sum(lstp.num),0) totalNum,
         IFNULL(sum(lstp.weight),0) totalWeight,
         IFNULL(sum(lstp.volume),0) totalVolume,
@@ -520,27 +515,14 @@
         and lsoi.waybill_id = #{waybillId}
     </select>
     <select id="findWaybillDetailByWaybillId" resultType="com.logpm.statistics.vo.WaybillDetailByWaybillNoVo">
-        SELECT
+        SELECT waybill_id,waybill_no,product_id,product_name,num,volume,weight,price,subtotal_freight
-        waybill_id,
+        from logpm_warehouse_waybill_detail
-        GROUP_CONCAT( t.b ) AS goodsName
-        FROM
-        (
-        SELECT
-        waybill_id,
-        concat( product_name, '(', sum( num ), ')' ) AS b
-        FROM
-        logpm_warehouse_waybill_detail
         WHERE
-        waybill_id IN
+         is_deleted=0
+        and waybill_id IN
         <foreach collection="warehouseIdSet" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        GROUP BY
-        waybill_id,
-        product_name
-        ) t
-        GROUP BY
-        t.waybill_id
     </select>
 
     <delete id="deleteListByOrderInfoIds">

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -26,12 +26,7 @@ import com.logpm.statistics.dto.MerchantStatisticsDTO;
 import com.logpm.statistics.entity.*;
 import com.logpm.statistics.mapper.StatisticsOrderInfoMapper;
 import com.logpm.statistics.service.*;
-import com.logpm.statistics.vo.StatisticsChangesRecordVO;
+import com.logpm.statistics.vo.*;
-import com.logpm.statistics.vo.StatisticsOrderInfoExportVO;
-import com.logpm.statistics.vo.StatisticsOrderInfoVO;
-import com.logpm.statistics.vo.StatisticsPackageFeeInfoVO;
-import com.logpm.statistics.vo.StatisticsReconciliationOrderInfoVO;
-import com.logpm.statistics.vo.WaybillDetailByWaybillNoVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.enums.BooleanZeroOneEnums;
@@ -46,16 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -110,12 +96,17 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		List<StatisticsOrderInfoVO> records = statisticsOrderInfoVOIPage.getRecords();
 		//把records中所有的orderInfoId放入一个集合
 		List<Long> orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList());
+		// 得到运单ID
+		Set<Long> waybillIds =  records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet());
+
+		// 查询运单明细集合
+		List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds);
+
+		// 通过运单号进行分组
+		Map<Long, List<WaybillDetailByWaybillNoVo>> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId));
+
 
-		List<String> waybillNoList = records.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toList());
 
-		// 运单ID集合
-//		Set<Long> warehouseIdSet = records.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet());
-//		List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVoList;
 		Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap;
 		if(CollUtil.isNotEmpty(orderInfoIdList)){
 			List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
@@ -129,32 +120,55 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
         } else {
             orderPackageInfoMap = null;
         }
-//        if(CollUtil.isNotEmpty(warehouseIdSet)){
+
-//			waybillDetailByWaybillNoVoList = baseMapper.findWaybillDetailByWaybillId(warehouseIdSet);
-//		} else {
-//            waybillDetailByWaybillNoVoList = null;
-//        }
 
         records.forEach(statisticsOrderInfoVO -> {
-			Long waybillId = statisticsOrderInfoVO.getWaybillId();
+//			Long waybillId = statisticsOrderInfoVO.getWaybillId();
-			WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo1 = null;
+
+
+
 
 			Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
 			if(orderPackageInfoMap!=null){
 
 				StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
+
+
 				if(statisticsPackageFeeInfoVO!=null){
-					statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName());
+//					statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName());
 					BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
+
+					String[] split = statisticsOrderInfoVO.getGoodsName().split(",");
+					List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId());
+
+					StringBuffer sb = new StringBuffer();
+					StringBuffer sb1 = new StringBuffer();
+
+					for (String s : split) {
+
+						Optional<WaybillDetailByWaybillNoVo> first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst();
+
+						if(first.isPresent()){
+							WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get();
+
+							if(!sb.toString().isEmpty()){
+								sb.append(",");
+							}
+							sb.append(waybillDetailByWaybillNoVo.getNum());
+
+							if(!sb1.toString().isEmpty()){
+								sb1.append(",");
+							}
+							sb1.append(waybillDetailByWaybillNoVo.getPrice());
+						}
+					}
+
+					statisticsOrderInfoVO.setGoodsNum(sb.toString());
+					statisticsOrderInfoVO.setGoodsPrice(sb1.toString());
+
 				}
 			}
 
-//			if(waybillDetailByWaybillNoVoList!=null){
-//				waybillDetailByWaybillNoVo1 = waybillDetailByWaybillNoVoList.stream().filter(waybillDetailByWaybillNoVo -> Objects.equals(waybillDetailByWaybillNoVo.getWaybillId(), waybillId)).findFirst().orElse(null);
-//			}
-//			if(waybillDetailByWaybillNoVo1!=null){
-//				statisticsOrderInfoVO.setGoodsName(waybillDetailByWaybillNoVo1.getGoodsName());
-//			}
 		});
 
 		statisticsOrderInfoVOIPage.setRecords(records);