Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

shane

2021-08-20 ab6a423cf604b83f06b5768dbc162ece744a32d9

 java110-core/src/main/java/com/java110/core/factory/DataTransactionFactory.java

old mode 100644
new mode 100755
@@ -1,20 +1,17 @@
package com.java110.core.factory;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
import com.java110.common.constant.MappingConstant;
import com.java110.common.constant.OrderTypeCdConstant;
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.SequenceUtil;
import com.java110.common.util.StringUtil;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.OrderTypeCdConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.core.context.DataFlow;
import com.java110.core.context.DataFlowContext;
import com.java110.entity.service.PageData;
import com.java110.core.context.PageData;

import java.util.Date;
import java.util.Map;
@@ -270,7 +267,7 @@


    /**
     * 创建请求 center 报文 分装成JSON
     * 创建请求 order 报文 分装成JSON
     * @param appId
     * @return
     */
@@ -279,7 +276,7 @@
        JSONObject paramIn = JSONObject.parseObject("{\"orders\":{},\"business\":[]}");
        JSONObject orders = paramIn.getJSONObject("orders");
        orders.put("appId",appId);
        orders.put("transactionId", SequenceUtil.getTransactionId());
        orders.put("transactionId", GenerateCodeFactory.getTransactionId());
        orders.put("userId",userId);
        orders.put("orderTypeCd",orderTypeCd);
        orders.put("requestTime",DateUtil.getNowDefault());