Merge branch 'dev' into pre-production

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, "系统异常");
+		}
 	}