From 2ec083f02ede9f14ca1067adebe4196050e37028 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 16 二月 2020 20:30:03 +0800
Subject: [PATCH] 优化编辑出错问题
---
OrderService/src/main/java/com/java110/order/api/OrderApi.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/OrderService/src/main/java/com/java110/order/api/OrderApi.java b/OrderService/src/main/java/com/java110/order/api/OrderApi.java
index 801afcb..d45765a 100644
--- a/OrderService/src/main/java/com/java110/order/api/OrderApi.java
+++ b/OrderService/src/main/java/com/java110/order/api/OrderApi.java
@@ -1,6 +1,8 @@
package com.java110.order.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.entity.order.Orders;
+import com.java110.order.smo.IOrderProcessServiceSMO;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.BusinessException;
import com.java110.utils.util.Assert;
@@ -37,6 +39,9 @@
@Autowired
private IOrderServiceSMO orderServiceSMOImpl;
+ @Autowired
+ private IOrderProcessServiceSMO orderProcessServiceSMOImpl;
+
/**
* 璁㈠崟璇锋眰鏈嶅姟
* @param orderInfo 璁㈠崟淇℃伅
@@ -58,7 +63,18 @@
DataFlowEventPublishing.receiveRequest(orderInfo, headers);
//棰勬牎楠�
preValiateOrderInfo(orderInfo);
- responseEntity = orderServiceSMOImpl.service(orderInfo, headers);
+ JSONObject order = JSONObject.parseObject(orderInfo).getJSONObject("orders");
+
+ if(!order.containsKey("orderProcess")){
+ responseEntity = orderServiceSMOImpl.service(orderInfo, headers);
+ }else if(Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT.equals(order.getString("orderProcess"))){
+ responseEntity = orderProcessServiceSMOImpl.preService(orderInfo, headers);
+ }else if(Orders.ORDER_PROCESS_ORDER_CONFIRM_SUBMIT.equals(order.getString("orderProcess"))){
+ responseEntity = orderProcessServiceSMOImpl.confirmService(orderInfo, headers);
+ }else{
+ responseEntity = orderServiceSMOImpl.service(orderInfo, headers);
+ }
+
} catch (Exception e) {
logger.error("璇锋眰璁㈠崟寮傚父", e);
responseEntity = new ResponseEntity<String>("璇锋眰涓績鏈嶅姟鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
--
Gitblit v1.8.0