调整订单调度流程 提供 预提交 和确认提交功能

wuxw

2020-01-10 b8adeace2ae4e3231afd405b12bb5b83144e4c9a

 java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java

@@ -2,13 +2,14 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.CommonConstant;
import com.java110.common.util.Assert;
import com.java110.common.util.DateUtil;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.entity.order.Business;
import com.java110.entity.order.BusinessAttrs;
import com.java110.entity.order.Orders;
import com.java110.entity.order.OrdersAttrs;
import com.java110.utils.util.StringUtil;

import java.util.*;

@@ -18,8 +19,9 @@
 */
public class OrderDataFlow extends AbstractOrderDataFlowContext {

    public OrderDataFlow(){}

    protected OrderDataFlow(Date startDate, String code) {
    public OrderDataFlow(Date startDate, String code) {
        super(startDate, code);
    }

@@ -73,12 +75,15 @@
        Assert.isJsonObject(reqInfo,"当前报文不是有效json,请检查"+reqInfo);
         this.setDataFlowId(UUID.randomUUID().toString().replace("-","").toLowerCase());
        //赋值请求报文
        this.setResJson(JSONObject.parseObject(reqInfo));
        this.setReqJson(JSONObject.parseObject(reqInfo));
        //赋值 请求头信息
        this.setReqHeaders(headerAll);

        //构建返回头
        builderResHeaders();

        //构建返回json 为{"msg":[]}
        builderResJson();

        //构建 订单信息
        builderOrders();
@@ -123,7 +128,7 @@

        Assert.isDate(this.getReqHeaders().get(CommonConstant.HTTP_REQ_TIME),"构建OrderDataFlow对象失败，请求头中"+CommonConstant.HTTP_REQ_TIME+"格式错误");

        this.orders.setRequestTime(DateUtil.getDefaultDateFromString(this.getReqHeaders().get(CommonConstant.HTTP_REQ_TIME)));
        this.orders.setRequestTime(this.getReqHeaders().get(CommonConstant.HTTP_REQ_TIME));

        this.orders.setoId("-1");

@@ -131,6 +136,14 @@

        Assert.jsonObjectHaveKey(tmpOrderJson,"orderTypeCd","请求报文错误，未找到orderTypeCd节点");
        this.orders.setOrderTypeCd(tmpOrderJson.getString("orderTypeCd"));

        if(tmpOrderJson.containsKey("orderProcess") && !StringUtil.isEmpty(tmpOrderJson.getString("orderProcess"))){
            this.orders.setOrderProcess(tmpOrderJson.getString("orderProcess"));
        }

        if(tmpOrderJson.containsKey("oId") && !StringUtil.isEmpty(tmpOrderJson.getString("oId"))){
            this.orders.setoId(tmpOrderJson.getString("oId"));
        }

        if(!tmpOrderJson.containsKey("attrs")){
            return ;
@@ -159,8 +172,11 @@
    private void builderBusiness() {

        this.businessList = new ArrayList<Business>();
        if(!this.getReqJson().containsKey("business")){
            return;
        }

        JSONArray tmpBusiness = this.getResJson().getJSONArray("business");
        JSONArray tmpBusiness = this.getReqJson().getJSONArray("business");

        Business business = null;
        for (int tmpBusinessIndex = 0;tmpBusinessIndex < tmpBusiness.size();tmpBusinessIndex++){
@@ -213,6 +229,15 @@
        }
    }

    /**
     * 初始化构建返回报文
     */
    private void builderResJson(){
        JSONObject resJson = new JSONObject();
        resJson.put("msg",new JSONArray());
        this.setResJson(resJson);
    }


    public Orders getOrders() {
        return orders;