From 59f809d8af0cc22c3ebdd84540e27b6e5273a710 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 1 Nov 2024 16:44:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改生成对账单的控制逻辑
  1.1 ToB时不需要校验是否计算价格
  1.2 修改提示语句
---
 .../service/impl/StatisticsOrderInfoServiceImpl.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
index 9e8689cd3..83909201c 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
@@ -504,12 +504,15 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 
 		for (StatisticsOrderInfoEntity orderInfoEntity : orderInfoEntities) {
+			if (orderInfoEntity.getTypeService() != null && orderInfoEntity.getTypeService() != 2) {
+				continue;
+			}
 			Integer syncFeeStatus = orderInfoEntity.getSyncFeeStatus();
 			Long orderId = orderInfoEntity.getId();
 			String orderCode = orderInfoEntity.getOrderCode();
 			if(syncFeeStatus == 0){
-				log.warn("############createReconciliationOrder: 订单还未同步数据 orderId={}",orderId);
-				return R.fail(405,"订单["+orderCode+"]还未同步数据");
+				log.warn("############createReconciliationOrder: 订单还未计算价格的数据 orderId={}",orderId);
+				return R.fail(405,"订单["+orderCode+"]未计算价格的数据");
 			}
 		}