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/OrderServiceSMOImpl.java | 73 +++++++++++-------------------------
1 files changed, 22 insertions(+), 51 deletions(-)
diff --git a/service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
old mode 100644
new mode 100755
index 41e5e37..047ece3
--- a/service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
@@ -2,22 +2,23 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.RestTemplate;
+import com.java110.core.context.*;
+import com.java110.core.event.center.DataFlowEventPublishing;
+import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.OrderDataFlowContextFactory;
+import com.java110.core.log.LogAgent;
+import com.java110.entity.center.AppService;
+import com.java110.entity.center.DataFlowLinksCost;
+import com.java110.entity.order.Business;
+import com.java110.entity.order.ServiceBusiness;
+import com.java110.order.dao.ICenterServiceDAO;
+import com.java110.order.smo.IOrderServiceSMO;
+import com.java110.service.init.ServiceInfoListener;
+import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.KafkaConstant;
-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.BusinessStatusException;
-import com.java110.utils.exception.DAOException;
-import com.java110.utils.exception.DecryptException;
-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.constant.*;
+import com.java110.utils.exception.*;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.kafka.KafkaFactory;
import com.java110.utils.log.LoggerEngine;
@@ -25,28 +26,9 @@
import com.java110.utils.util.ServiceBusinessUtil;
import com.java110.utils.util.StringUtil;
import com.java110.utils.util.WebServiceAxisClient;
-import com.java110.core.client.RestTemplate;
-import com.java110.core.context.DataFlow;
-import com.java110.core.context.IOrderDataFlowContext;
-import com.java110.core.context.IOrderNotifyDataFlowContext;
-import com.java110.core.context.IOrderResponse;
-import com.java110.core.context.OrderDataFlow;
-import com.java110.core.context.OrderNotifyDataFlow;
-import com.java110.core.factory.AuthenticationFactory;
-import com.java110.core.factory.OrderDataFlowContextFactory;
-import com.java110.entity.center.AppService;
-import com.java110.entity.center.DataFlowLinksCost;
-import com.java110.entity.order.Business;
-import com.java110.entity.order.ServiceBusiness;
-import com.java110.core.event.center.DataFlowEventPublishing;
-import com.java110.core.log.LogAgent;
-import com.java110.order.dao.ICenterServiceDAO;
-import com.java110.order.smo.IOrderServiceSMO;
-import com.java110.service.init.ServiceInfoListener;
-import com.java110.service.smo.IQueryServiceSMO;
import org.apache.commons.lang3.math.NumberUtils;
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.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -69,8 +51,6 @@
public class OrderServiceSMOImpl extends AbstractOrderServiceSMOImpl implements IOrderServiceSMO {
private static Logger logger = LoggerFactory.getLogger(OrderServiceSMOImpl.class);
-
-
@Autowired
@@ -107,6 +87,9 @@
DataFlowEventPublishing.invokeBusinessSystem(dataFlow);
invokeBusinessSystem(dataFlow);
+ // 涓氬姟璋冪敤瀹屾垚
+ DataFlowEventPublishing.invokeFinishBusinessSystem(dataFlow);
+
//鑳藉鎵ц鍒拌繖涓�姝� 璁や负鏄兘鎴愬姛浜�
refreshOrderDataFlowResJson(dataFlow);
@@ -137,12 +120,10 @@
// LogAgent.createLogMessage(dataFlow.getResponseHeaders(),responseEntity.getBody()),endDate.getTime()-dataFlow.getStartDate().getTime());
// DataFlowEventPublishing.dataResponse(dataFlow,reqJson,headers);
}
-
-
//杩欓噷淇濆瓨鑰楁椂锛屼互鍙婃棩蹇�
- return responseEntity;
}
+ return responseEntity;
}
@@ -320,7 +301,6 @@
//OrderDataFlowContextFactory.addCostTime(dataFlow, "updateOrderAndBusinessError", "璁㈠崟鐘舵�佹敼涓哄け璐ヨ�楁椂", startDate);
}
-
/**
@@ -637,7 +617,7 @@
header.add(key, dataFlow.getRequestCurrentHeaders().get(key));
}
HttpEntity<String> httpEntity = new HttpEntity<String>(reqData, header);
- responseMessage = restTemplateNoLoadBalanced.postForObject(service.getUrl(), httpEntity, String.class);
+ responseMessage = outRestTemplate.postForObject(service.getUrl(), httpEntity, String.class);
} else {//webservice鏂瑰紡
responseMessage = (String) WebServiceAxisClient.callWebService(service.getUrl(), service.getMethod(),
new Object[]{dataFlow.getRequestBusinessJson().toJSONString()},
@@ -645,7 +625,6 @@
}
return responseMessage;
}
-
/**
@@ -744,7 +723,6 @@
}
-
public ICenterServiceDAO getCenterServiceDaoImpl() {
return centerServiceDaoImpl;
}
@@ -769,11 +747,4 @@
this.queryServiceSMOImpl = queryServiceSMOImpl;
}
- public RestTemplate getRestTemplateNoLoadBalanced() {
- return restTemplateNoLoadBalanced;
- }
-
- public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
- this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
- }
}
--
Gitblit v1.8.0