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 | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 1885fe5..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
@@ -6,27 +6,40 @@
import com.java110.core.context.IOrderDataFlowContext;
import com.java110.core.context.IOrderNotifyDataFlowContext;
import com.java110.core.context.OrderDataFlow;
+import com.java110.core.event.center.DataFlowEventPublishing;
import com.java110.core.factory.OrderDataFlowContextFactory;
import com.java110.entity.order.Business;
import com.java110.entity.order.ServiceBusiness;
-import com.java110.core.event.center.DataFlowEventPublishing;
import com.java110.order.dao.ICenterServiceDAO;
import com.java110.order.smo.IOrderProcessServiceSMO;
import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.*;
-import com.java110.utils.exception.*;
+import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.exception.BusinessException;
+import com.java110.utils.exception.InitConfigDataException;
+import com.java110.utils.exception.NoAuthorityException;
+import com.java110.utils.exception.NoSupportException;
+import com.java110.utils.exception.OrdersException;
+import com.java110.utils.exception.RuleException;
+import com.java110.utils.exception.SMOException;
import com.java110.utils.kafka.KafkaFactory;
import com.java110.utils.log.LoggerEngine;
-import com.java110.utils.util.*;
+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;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
@@ -86,7 +99,7 @@
//鑳藉鎵ц鍒拌繖涓�姝� 璁や负鏄兘鎴愬姛浜�
refreshOrderDataFlowResJson(dataFlow);
- responseEntity = new ResponseEntity<String>(dataFlow.getResJson().toJSONString(),OrderDataFlowContextFactory.hashMap2MultiValueMap(dataFlow.getResHeaders()), HttpStatus.OK);
+ 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);
@@ -103,9 +116,8 @@
responseEntity = new ResponseEntity<String>("鍐呴儴寮傚父浜嗭細" + e.getMessage() + e.getLocalizedMessage(), OrderDataFlowContextFactory.hashMap2MultiValueMap(dataFlow.getResHeaders()), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
//杩欓噷淇濆瓨鑰楁椂锛屼互鍙婃棩蹇�
- return responseEntity;
-
}
+ return responseEntity;
}
/**
@@ -266,6 +278,8 @@
dataFlow = OrderDataFlowContextFactory.newInstance(OrderDataFlow.class).builder(reqJson, headers);
notifyInstanceOrder(dataFlow, headers);
+ // 涓氬姟璋冪敤瀹屾垚
+ DataFlowEventPublishing.invokeConfirmFinishBusinessSystem(dataFlow);
} catch (Exception e) {
LoggerEngine.error("纭鎻愪氦璁㈠崟澶辫触", e);
//10.0 鎴愬姛鐨勬儏鍐典笅閫氱煡涓嬫父绯荤粺澶辫触灏嗙姸鎬佹敼涓篘E锛屼汉宸ュ鐞嗐��
@@ -273,9 +287,8 @@
} finally {
responseEntity = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
-
- return responseEntity;
}
+ return responseEntity;
}
/**
@@ -395,11 +408,5 @@
this.queryServiceSMOImpl = queryServiceSMOImpl;
}
- public RestTemplate getRestTemplateNoLoadBalanced() {
- return restTemplateNoLoadBalanced;
- }
- public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
- this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
- }
}
--
Gitblit v1.8.0