From bfe977ac737f7b9e6281b40a65c0b7979b0de21b Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 25 Dec 2024 14:10:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E7=AD=BE=E6=94=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/controller/MerchantStatisticsController.java   | 2 --
 .../service/impl/StatisticsOrderInfoServiceImpl.java          | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java
index 54e725bb2..65ab5ab43 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java
@@ -157,9 +157,7 @@ public class MerchantStatisticsController {
 		String method = "############pageReconciliationList: ";
 		log.info(method + "请求参数{}", merchantStatisticsDTO);
 		try {
-
 			IPage<StatisticsReconciliationOrderInfoEntity> pages = reconciliationOrderInfoService.pageReconciliationList(merchantStatisticsDTO);
-
 			return R.data(pages);
 		} catch (CustomerException e) {
 			log.error(e.message, e);
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 42d023405..c0c41bcaa 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
@@ -1429,9 +1429,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 			statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay()));
 
 			String signName = "未签收";
-			if (90 == statisticsOrderInfoVO.getSignStatus()) {
+			if (1 == statisticsOrderInfoVO.getSignStatus()) {
 				signName = "部分签收";
-			} else if (100 == statisticsOrderInfoVO.getSignStatus()) {
+			} else if (2 == statisticsOrderInfoVO.getSignStatus()) {
 				signName = "已签收";
 			}
 //			statisticsOrderInfoExportVO.setSignStatus();