From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/context/BusinessServiceDataFlow.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/context/BusinessServiceDataFlow.java b/java110-core/src/main/java/com/java110/core/context/BusinessServiceDataFlow.java
old mode 100644
new mode 100755
index ad21b1c..aebc1ca
--- a/java110-core/src/main/java/com/java110/core/context/BusinessServiceDataFlow.java
+++ b/java110-core/src/main/java/com/java110/core/context/BusinessServiceDataFlow.java
@@ -1,10 +1,11 @@
package com.java110.core.context;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.InitDataFlowContextException;
-import com.java110.entity.center.Business;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.InitDataFlowContextException;
+import com.java110.dto.system.AppBusiness;
+import org.slf4j.Logger;
+import com.java110.core.log.LoggerFactory;
import java.util.ArrayList;
import java.util.Date;
@@ -16,34 +17,26 @@
* Created by wuxw on 2018/5/18.
*/
public class BusinessServiceDataFlow extends AbstractDataFlowContext {
+ private final static Logger logger = LoggerFactory.getLogger(BusinessServiceDataFlow.class);
-
- private String businessType;
private String bId;
private Map<String,Object> paramOut;
@Override
- public Orders getOrder() {
+ public IOrders getOrder() {
return this;
}
- public String getBusinessType() {
- return businessType;
- }
-
- public void setBusinessType(String businessType) {
- this.businessType = businessType;
- }
public BusinessServiceDataFlow(Date startDate, String code) {
super(startDate, code);
}
- public BusinessServiceDataFlow builder(String reqInfo, Map<String, String> headerAll) throws InitDataFlowContextException {
+ public BusinessServiceDataFlow doBuilder(String reqInfo, Map<String, String> headerAll) throws InitDataFlowContextException {
try{
- Business business = null;
+ AppBusiness business = null;
JSONObject reqInfoObj = JSONObject.parseObject(reqInfo);
JSONObject orderObj = reqInfoObj.getJSONObject("orders");
JSONObject businessObject = reqInfoObj.getJSONObject("business");
@@ -55,14 +48,16 @@
this.setBusinessType(orderObj.getString("businessType"));
this.setbId(businessObject.getString("bId"));
paramOut = new HashMap<String, Object>();
- this.businesses = new ArrayList<Business>();
- business = new Business().builder(businessObject);
+ this.businesses = new ArrayList<AppBusiness>();
+ business = new AppBusiness().builder(businessObject);
businesses.add(business);
this.setCurrentBusiness(business);
if (headerAll != null){
- this.headers.putAll(headerAll);
+ this.requestCurrentHeaders.putAll(headerAll);
+ this.requestHeaders.putAll(headerAll);
}
}catch (Exception e){
+ logger.error("鍒濆鍖栧璞� BusinessServiceDataFlow 澶辫触",e);
throw new InitDataFlowContextException(ResponseConstant.RESULT_PARAM_ERROR,"鍒濆鍖栧璞� BusinessServiceDataFlow 澶辫触 "+reqInfo);
}
return this;
--
Gitblit v1.8.0