java110
2020-06-14 91f58ac34a01db7bb4e30a57af4454e0c36fd1c9
java110-core/src/main/java/com/java110/core/factory/OrderDataFlowContextFactory.java
@@ -2,25 +2,23 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.cache.MappingCache;
import com.java110.common.constant.CommonConstant;
import com.java110.common.constant.MappingConstant;
import com.java110.common.constant.ResponseConstant;
import com.java110.common.constant.StatusConstant;
import com.java110.common.util.Assert;
import com.java110.common.util.DateUtil;
import com.java110.common.util.StringUtil;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.core.context.DataFlow;
import com.java110.core.context.IOrderDataFlowContext;
import com.java110.core.context.IOrderNotifyDataFlowContext;
import com.java110.entity.center.AppRoute;
import com.java110.entity.center.AppService;
import com.java110.entity.center.Business;
import com.java110.entity.center.DataFlowLinksCost;
import com.java110.entity.order.BusinessAttrs;
import com.java110.entity.order.Orders;
import com.java110.entity.order.OrdersAttrs;
import com.java110.entity.order.ServiceBusiness;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.http.HttpHeaders;
import org.springframework.util.MultiValueMap;
@@ -262,10 +260,10 @@
     * @param dataFlow
     * @return
     */
    public static Map getNeedDeleteBusiness(IOrderDataFlowContext dataFlow){
    public static Map getNeedDeleteBusiness(IOrderDataFlowContext dataFlow,List<com.java110.entity.order.Business> deleteBusinesses){
        Map business = new HashMap();
        String bId = "";
        for(com.java110.entity.order.Business busi:dataFlow.getBusinessList()){
        for(com.java110.entity.order.Business busi:deleteBusinesses){
            bId += busi.getbId()+",";
        }
        business.put("bId",bId.substring(0,bId.length()-1));
@@ -388,6 +386,11 @@
        List<Map> orderAttrs = new ArrayList<Map>();
        List<OrdersAttrs> attrs = orders.getOrdersAttrs();
        if(attrs == null || attrs.size() == 0){
            return orderAttrs;
        }
        Map attrMap = null;
        for(OrdersAttrs ordersAttr:attrs)
        {
@@ -694,13 +697,10 @@
     * @return
     */
    public static List<com.java110.entity.order.Business> getSynchronousBusinesses(IOrderDataFlowContext dataFlow){
        AppService service = null;
        AppRoute route = null;
        List<com.java110.entity.order.Business> syschronousBusinesses = new ArrayList<com.java110.entity.order.Business>();
        for(com.java110.entity.order.Business business :dataFlow.getBusinessList()){
            if(CommonConstant.ORDER_INVOKE_METHOD_SYNCHRONOUS.equals(business.getInvokeModel()) || StringUtil.isEmpty(business.getInvokeModel())){
                business.setSeq(service.getSeq());
                syschronousBusinesses.add(business);
            }
        }