Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

 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) {