From 1d94bd1e11ce2c768e42b23e67a945fe66c2e019 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Thu, 11 Jul 2024 15:56:48 +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=8D=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MerchantStatisticsController.java       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 406ff029b..882a270b2 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
@@ -181,7 +181,15 @@ public class MerchantStatisticsController {
 	public R<Boolean> calculateRealCost(@PathVariable("id") Long id) {
 		String method = "############calculateRealCost: ";
 		log.info(method + "请求参数{}", id);
-		return R.status(statisticsOrderInfoService.calculateRealCost(id));
+		try {
+			return R.status(statisticsOrderInfoService.calculateRealCost(id));
+		} catch (CustomerException e) {
+			log.error(e.message, e);
+			return R.fail(e.code, e.message);
+		} catch (Exception e) {
+			log.error(method + "系统异常", e);
+			return R.fail(500, "系统异常");
+		}
 	}