优化代码

service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java

@@ -166,7 +166,7 @@ public class MachinePaymentNoticeAdapt extends DatabusAdaptImpl {
         // 根据特定权限查询 有该权限的 员工
         BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
         //basePrivilegeDto.setPId("502020121454780004");
-        basePrivilegeDto.setResource("/payFeeNotice");
+        basePrivilegeDto.setResource("/wechatNotification");
         basePrivilegeDto.setStoreId(feeDtos.get(0).getIncomeObjId());
         List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
         String url = sendMsgUrl + accessToken;

service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java

@@ -6,19 +6,28 @@ import com.java110.core.client.RestTemplate;
 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 org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +35,11 @@ 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 @@ public class OrderProcessServiceSMOImpl extends AbstractOrderServiceSMOImpl impl
             //能够执行到这一步 认为是都成功了
             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);
@@ -266,6 +279,8 @@ public class OrderProcessServiceSMOImpl extends AbstractOrderServiceSMOImpl impl
             dataFlow = OrderDataFlowContextFactory.newInstance(OrderDataFlow.class).builder(reqJson, headers);
 
             notifyInstanceOrder(dataFlow, headers);
+            // 业务调用完成
+            DataFlowEventPublishing.invokeFinishBusinessSystem(dataFlow);
         } catch (Exception e) {
             LoggerEngine.error("确认提交订单失败", e);
             //10.0 成功的情况下通知下游系统失败将状态改为NE，人工处理。