fix：

1.调整2C的预对账单导出

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java

@@ -73,7 +73,21 @@ public class MerchantStatisticsController {
 
 		List<StatisticsOrderInfoExportVO> ls = statisticsOrderInfoService.orderInfoListExport(merchantStatisticsDTO);
 		//导出ls
-		ExcelUtil.export(response, "预对账单数据", "预对账单数据", ls, StatisticsOrderInfoExportVO.class);
+		ExcelUtil.export(response, "预对账单数据2B", "预对账单数据2B", ls, StatisticsOrderInfoExportVO.class);
+	}
+
+
+	@ResponseBody
+	@PostMapping("/orderInfoListExport2C")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "预对账单列表导出", notes = "传入merchantStatisticsDTO")
+	public void orderInfoListExport2C(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO, HttpServletResponse response) {
+		String method = "############orderInfoListExport: ";
+		log.info(method + "请求参数{}", merchantStatisticsDTO);
+
+		List<StatisticsOrderInfoExportVO> ls = statisticsOrderInfoService.orderInfoListExport2C(merchantStatisticsDTO);
+		//导出ls
+		ExcelUtil.export(response, "预对账单数据2C", "预对账单数据2C", ls, StatisticsOrderInfoExportVO.class);
 	}
 
 	@ResponseBody

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

@@ -20,6 +20,7 @@ import java.util.Set;
 public interface StatisticsOrderInfoMapper extends BaseMapper<StatisticsOrderInfoEntity> {
 
 	IPage<StatisticsOrderInfoVO> pageList(IPage<Object> page, @Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
+	List<StatisticsOrderInfoVO> pageList2CExport( @Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
 
     List<StatisticsOrderInfoVO> findStatementListByOrderInfoIds(@Param("orderInfoIds") List<Long> orderInfoIds);
 

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

@@ -924,6 +924,130 @@
         </foreach>
         group by lsoi.waybill_id
     </select>
+    <select id="pageList2CExport" resultType="com.logpm.statistics.vo.StatisticsOrderInfoVO">
+
+        select lsoi.id orderInfoId,
+        lsoi.brand_id brandId,
+        lsoi.brand brand,
+        lsoi.waybill_id waybillId,
+        lsoi.waybill_no waybillNo,
+        lsoi.order_code orderCode,
+        lsoi.type_service typeService,
+        lww.shipper shipper,
+        lww.shipper_name shipperPerson,
+        lww.shipper_mobile shipperMobile,
+        lww.shipper_address shipperAddress,
+        lww.consignee consignee,
+        lww.consignee_name consigneePerson,
+        lww.consignee_mobile consigneeMobile,
+        lww.consignee_address consigneeAddress,
+        lsoi.sign_status signStatus,
+        lsoi.sign_date signDate,
+        lww.create_time openTime,
+        lww.departure departure,
+        lww.destination destination,
+        lsoi.departure_warehouse_id departureWarehouseId,
+        lsoi.departure_warehouse_name departureWarehouseName,
+        lsoi.destination_warehouse_id destinationWarehouseId,
+        lsoi.destination_warehouse_name destinationWarehouseName,
+        lww.delivery_method deliveryMethod,
+        lww.customer_train customerTrain,
+        lww.pay_type payType,
+        lww.pay_way payWay,
+        lsoi.create_reconciliation_order_status createReconciliationOrderStatus,
+        lsoi.create_reconciliation_user_name createReconciliationUserName,
+        lsoi.create_reconciliation_date createReconciliationDate,
+        lsoi.cycle cycle,
+        lsoi.warehouse_fee_interval warehouseFeeInterval,
+        lsoi.sync_fee_status syncFeeStatus,
+        lsoi.sync_fee_date syncFeeDate,
+        lbc.clean_obj_type cleanObjType
+        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
+        where 1=1
+        and lsoi.create_reconciliation_order_status = 0
+        <if test="param.listType == 1">
+            and lsoi.type_service != '2'
+        </if>
+        <if test="param.listType == 2">
+            and lsoi.type_service = '2'
+        </if>
+        <if test="param.consignee != null and param.consignee != '' ">
+            and Locate(#{param.consignee},lww.consignee) > 0
+        </if>
+        <if test="param.confirmStatisticsOrder != null">
+            and lsoi.confirm_statistics_order = #{param.confirmStatisticsOrder}
+        </if>
+        <if test="param.syncFeeSstatus != null">
+            and lsoi.sync_fee_status = #{param.syncFeeSstatus}
+        </if>
+        <if test="param.signStatus != null">
+            and lsoi.sign_status = #{param.signStatus}
+        </if>
+        <if test="param.waybillNo != null and param.waybillNo != '' ">
+            and Locate(#{param.waybillNo},lww.waybill_no) > 0
+        </if>
+        <if test="param.orderCode != null and param.orderCode != '' ">
+            and Locate(#{param.orderCode},lww.order_no) > 0
+        </if>
+        <if test="param.shipper != null and param.shipper != '' ">
+            and Locate(#{param.shipper},lww.shipper) > 0
+        </if>
+        <if test="param.departureWarehouseName != null and param.departureWarehouseName != '' ">
+            and Locate(#{param.departureWarehouseName},lsoi.departure_warehouse_name) > 0
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != '' ">
+            and Locate(#{param.destinationWarehouseName},lsoi.destination_warehouse_name) > 0
+        </if>
+        <if test="param.typeService != null">
+            and lsoi.type_service = #{param.typeService}
+        </if>
+        <if test="param.openTimeStart != null">
+            and lww.document_making_time &gt;= #{param.openTimeStart}
+        </if>
+        <if test="param.openTimeEnd != null">
+            and lww.document_making_time &lt;= #{param.openTimeEnd}
+        </if>
+        <if test="param.signTimeStart != null">
+            and lsoi.sign_date &gt;= #{param.signTimeStart}
+        </if>
+        <if test="param.signTimeEnd != null">
+            and lsoi.sign_date &lt;= #{param.signTimeEnd}
+        </if>
+        <if test="param.syncFeeDateStart != null">
+            and lsoi.sync_fee_date &gt;= #{param.syncFeeDateStart}
+        </if>
+        <if test="param.syncFeeDateEnd != null">
+            and lsoi.sync_fee_date &lt;= #{param.syncFeeDateEnd}
+        </if>
+        <if test="param.shipperPerson != null and param.shipperPerson != '' ">
+            and Locate(#{param.shipperPerson},lww.shipper_person) > 0
+        </if>
+        <if test="param.shipperMoblie != null and param.shipperMoblie != '' ">
+            and Locate(#{param.shipperMoblie},lww.shipper_mobile) > 0
+        </if>
+        <if test="param.consigneePerson != null and param.consigneePerson != '' ">
+            and Locate(#{param.consigneePerson},lww.consignee_name) > 0
+        </if>
+        <if test="param.consigneeMobile != null and param.consigneeMobile != '' ">
+            and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
+        </if>
+        <if test="param.cleanObjType != null and param.cleanObjType != '' ">
+            and lbc.clean_obj_type = #{param.cleanObjType}
+        </if>
+        <if test="param.payType != null and param.payType != '' ">
+            and lww.pay_type = #{param.payType}
+        </if>
+        <if test="param.payWay != null and param.payWay != '' ">
+            and lww.pay_way = #{param.payWay}
+        </if>
+        and lsoi.destination_warehouse_id in
+        <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        group by lsoi.id
+    </select>
 
 
     <delete id="deleteDataByWaybillId" >

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

@@ -62,4 +62,5 @@ public interface IStatisticsOrderInfoService extends BaseService<StatisticsOrder
 
 	boolean calculateRealCostByWaybillId(Long id);
 
+	List<StatisticsOrderInfoExportVO> orderInfoListExport2C(MerchantStatisticsDTO merchantStatisticsDTO);
 }

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

@@ -1445,6 +1445,162 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 //		return records;
 	}
 
+	@Override
+	public List<StatisticsOrderInfoExportVO> orderInfoListExport2C(MerchantStatisticsDTO merchantStatisticsDTO) {
+
+		List<StatisticsOrderInfoExportVO> result = new ArrayList<>();
+		List<Long> warehouseIds = warehouseClient.getWarehouseIds();
+		if (!warehouseIds.isEmpty()) {
+			merchantStatisticsDTO.setWarehouseIds(warehouseIds);
+		}
+		List<StatisticsOrderInfoVO> records = baseMapper.pageList2CExport(merchantStatisticsDTO);
+
+		//把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);
+
+		//得到运单号
+		Set<String> orderCodeSet = records.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet());
+
+		// 通过运单号进行分组
+		Map<Long, List<WaybillDetailByWaybillNoVo>> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId));
+
+		Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap;
+		if (CollUtil.isNotEmpty(orderInfoIdList)) {
+			List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
+			//把orderPackageInfoList转化成以orderInfoId为key的Map
+			if (CollUtil.isNotEmpty(orderPackageInfoList)) {
+				orderPackageInfoMap = orderPackageInfoList.stream()
+					.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
+			} else {
+				orderPackageInfoMap = null;
+			}
+		} else {
+			orderPackageInfoMap = null;
+		}
+
+		List<AdvanceDetailDTO> advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet);
+		records.forEach(statisticsOrderInfoVO -> {
+//			Long waybillId = statisticsOrderInfoVO.getWaybillId();
+
+
+			Long waybillId = statisticsOrderInfoVO.getWaybillId();
+			String orderCode = statisticsOrderInfoVO.getOrderCode();
+			// 查询站存单上的
+
+			List<AdvanceDetailDTO> advanceDetailDTOList = advanceDetailDTOS.stream().
+				filter(advanceDetailDTO -> advanceDetailDTO.getWaybillId().equals(waybillId) && advanceDetailDTO.getOrderCode().equals(orderCode)).collect(Collectors.toList());
+
+			// 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量
+			Map<String, List<AdvanceDetailDTO>> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName));
+
+			Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
+			if (orderPackageInfoMap != null) {
+				StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
+
+				if (statisticsPackageFeeInfoVO != null) {
+//					statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName());
+					BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
+
+					if (StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())) {
+//						String[] split = statisticsOrderInfoVO.getGoodsName().split(",");
+						List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId());
+
+						StringBuffer sb = new StringBuffer();
+						StringBuffer sb1 = new StringBuffer();
+						StringBuffer sb3 = new StringBuffer();
+
+						if (collect.isEmpty()) {
+
+							if (waybillDetailByWaybillNoVos != null && !waybillDetailByWaybillNoVos.isEmpty()) {
+
+								for (WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo : waybillDetailByWaybillNoVos) {
+
+									if (!sb3.toString().isEmpty()) {
+										sb3.append(",");
+									}
+									sb3.append(waybillDetailByWaybillNoVo.getProductName());
+
+									if (!sb.toString().isEmpty()) {
+										sb.append(",");
+									}
+									sb.append(waybillDetailByWaybillNoVo.getNum());
+
+									if (!sb1.toString().isEmpty()) {
+										sb1.append(",");
+									}
+									sb1.append(waybillDetailByWaybillNoVo.getPrice());
+
+								}
+
+							}
+
+						} else {
+							collect.keySet().forEach(s -> {
+								if (!sb3.toString().isEmpty()) {
+									sb3.append(",");
+								}
+								sb3.append(s);
+								List<AdvanceDetailDTO> advanceDetailDTOS1 = collect.get(s);
+
+								if (waybillDetailByWaybillNoVos != null) {
+									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(",");
+										}
+
+										//统计 advanceDetailDTOS1 这个集合种 quantity 的和值
+										int sum = advanceDetailDTOS1.stream().mapToInt(AdvanceDetailDTO::getQuantity).sum();
+										sb.append(sum);
+
+										if (!sb1.toString().isEmpty()) {
+											sb1.append(",");
+										}
+										sb1.append(waybillDetailByWaybillNoVo.getPrice());
+									}
+								}
+
+
+							});
+
+						}
+
+						statisticsOrderInfoVO.setGoodsName(sb3.toString());
+						statisticsOrderInfoVO.setGoodsNum(sb.toString());
+						statisticsOrderInfoVO.setGoodsPrice(sb1.toString());
+					}
+
+				}
+			}
+			StatisticsOrderInfoExportVO statisticsOrderInfoExportVO = new StatisticsOrderInfoExportVO();
+			BeanUtil.copy(statisticsOrderInfoVO, statisticsOrderInfoExportVO);
+			statisticsOrderInfoExportVO.setTypeServiceName(DistributionTypeConstant.getName(statisticsOrderInfoVO.getTypeService()));
+			statisticsOrderInfoExportVO.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, statisticsOrderInfoVO.getPayType()));
+			statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay()));
+
+			String signName = "未签收";
+			if (1 == statisticsOrderInfoVO.getSignStatus()) {
+				signName = "部分签收";
+			} else if (2 == statisticsOrderInfoVO.getSignStatus()) {
+				signName = "已签收";
+			}
+//			statisticsOrderInfoExportVO.setSignStatus();
+			statisticsOrderInfoExportVO.setSignStatusName(signName);
+
+			result.add(statisticsOrderInfoExportVO);
+
+		});
+		return result;
+	}
+
 	@Override
 	public Integer findBalanceOrderStatus(Long waybillId) {