From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
OrderService/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/OrderService/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java b/OrderService/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
index e42dbf1..67755b3 100644
--- a/OrderService/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
+++ b/OrderService/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
@@ -92,6 +92,8 @@
//鑳藉鎵ц鍒拌繖涓�姝� 璁や负鏄兘鎴愬姛浜�
refreshOrderDataFlowResJson(dataFlow);
+ responseEntity = new ResponseEntity<String>(dataFlow.getResJson().toJSONString(),OrderDataFlowContextFactory.hashMap2MultiValueMap(dataFlow.getResHeaders()), HttpStatus.OK);
+
} catch (BusinessException e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), OrderDataFlowContextFactory.hashMap2MultiValueMap(dataFlow.getResHeaders()), HttpStatus.INTERNAL_SERVER_ERROR);
} catch (OrdersException e) {
--
Gitblit v1.8.0