From 46eed722cd0431aa433bea2470b23015b8d83b3e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 二月 2022 10:03:25 +0800
Subject: [PATCH] 优化三亚物业 临时收费问题

---
 service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
old mode 100644
new mode 100755
index b937ad4..cbb3638
--- a/service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
@@ -29,7 +29,7 @@
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ServiceBusinessUtil;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -116,9 +116,8 @@
             responseEntity = new ResponseEntity<String>("鍐呴儴寮傚父浜嗭細" + e.getMessage() + e.getLocalizedMessage(), OrderDataFlowContextFactory.hashMap2MultiValueMap(dataFlow.getResHeaders()), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
             //杩欓噷淇濆瓨鑰楁椂锛屼互鍙婃棩蹇�
-            return responseEntity;
-
         }
+        return responseEntity;
     }
 
     /**
@@ -280,7 +279,7 @@
 
             notifyInstanceOrder(dataFlow, headers);
             // 涓氬姟璋冪敤瀹屾垚
-            DataFlowEventPublishing.invokeFinishBusinessSystem(dataFlow);
+            DataFlowEventPublishing.invokeConfirmFinishBusinessSystem(dataFlow);
         } catch (Exception e) {
             LoggerEngine.error("纭鎻愪氦璁㈠崟澶辫触", e);
             //10.0 鎴愬姛鐨勬儏鍐典笅閫氱煡涓嬫父绯荤粺澶辫触灏嗙姸鎬佹敼涓篘E锛屼汉宸ュ鐞嗐��
@@ -288,9 +287,8 @@
 
         } finally {
             responseEntity = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
-
-            return responseEntity;
         }
+        return responseEntity;
     }
 
     /**

--
Gitblit v1.8.0