Lianxun_Java.git

			@@ -157,6 +157,7 @@
			public static final String TRANSACTION_ID = "transaction-id";
			public static final String REQUEST_TIME = "req-time";
			public static final String USER_ID = "user-id";
			public static final String STORE_ID = "store-id";

			public final static String HTTP_SERVICE_API = "API";
			public final static String HTTP_SERVICE = "SERVICE";

			@@ -6,14 +6,15 @@
			import com.java110.core.annotation.Java110Listener;
			import com.java110.core.context.DataFlowContext;
			import com.java110.core.event.service.api.ServiceDataFlowEvent;
			import com.java110.core.log.LoggerFactory;
			import com.java110.dto.order.OrderDto;
			import com.java110.entity.center.AppService;
			import com.java110.intf.job.IDataBusInnerServiceSMO;
			import com.java110.utils.constant.CommonConstant;
			import com.java110.utils.constant.ServiceCodeConstant;
			import com.java110.utils.util.StringUtil;
			import com.java110.vo.ResultVo;
			import org.slf4j.Logger;
			import com.java110.core.log.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.http.*;
			import org.springframework.web.client.HttpStatusCodeException;
			@@ -49,6 +50,12 @@
			for (String key : context.getRequestCurrentHeaders().keySet()) {
			header.add(key, reqHeader.get(key));
			}
			if (reqHeader.containsKey(CommonConstant.USER_ID)) {
			reqJson.put("userId", reqHeader.get(CommonConstant.USER_ID));
			}
			if (reqHeader.containsKey(CommonConstant.STORE_ID)) {
			reqJson.put("storeId", reqHeader.get(CommonConstant.STORE_ID));
			}
			HttpEntity<String> httpEntity = new HttpEntity<String>(reqJson.toJSONString(), header);
			String orgRequestUrl = context.getRequestHeaders().get("REQUEST_URL");

			@@ -88,6 +88,11 @@
			}
			}

			if (!StringUtil.isEmpty(result.getStoreId())) {
			headers.remove("store-id");
			headers.put("store-id", result.getStoreId());
			}

			if (!headers.containsKey("user_id")) {
			headers.put("user_id", "-1");
			}

			@@ -233,7 +233,7 @@
			saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
			feePos = new ArrayList<>();
			feeAttrsPos = new ArrayList<>();
			if (saveFlag > 0) {
			if (saveFlag == 0) {
			failRooms += curFailRoomCount;
			} else {
			curFailRoomCount = 0;

	java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/listener/system/CmdListener.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史