ApiResult调整位置

weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java

@@ -18,8 +18,8 @@ import java.util.Map;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.foxinmy.weixin4j.exception.WeixinException;
-import com.foxinmy.weixin4j.http.message.XmlResult;
 import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
+import com.foxinmy.weixin4j.http.weixin.XmlResult;
 import com.foxinmy.weixin4j.model.Consts;
 import com.foxinmy.weixin4j.model.WeixinPayAccount;
 import com.foxinmy.weixin4j.payment.mch.APPPayRequest;

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/ApiResult.java

@@ -1,4 +1,4 @@
-package com.foxinmy.weixin4j.http.message;
+package com.foxinmy.weixin4j.http.weixin;
 
 import java.io.Serializable;
 

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/WeixinRequestExecutor.java

@@ -23,9 +23,7 @@ import com.foxinmy.weixin4j.http.entity.FormUrlEntity;
 import com.foxinmy.weixin4j.http.entity.HttpEntity;
 import com.foxinmy.weixin4j.http.entity.StringEntity;
 import com.foxinmy.weixin4j.http.factory.HttpClientFactory;
-import com.foxinmy.weixin4j.http.message.ApiResult;
 import com.foxinmy.weixin4j.http.message.XmlMessageConverter;
-import com.foxinmy.weixin4j.http.message.XmlResult;
 import com.foxinmy.weixin4j.logging.InternalLogger;
 import com.foxinmy.weixin4j.logging.InternalLoggerFactory;
 import com.foxinmy.weixin4j.model.Consts;

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/WeixinResponse.java

@@ -12,11 +12,9 @@ import com.foxinmy.weixin4j.http.HttpHeaders;
 import com.foxinmy.weixin4j.http.HttpResponse;
 import com.foxinmy.weixin4j.http.HttpStatus;
 import com.foxinmy.weixin4j.http.HttpVersion;
-import com.foxinmy.weixin4j.http.message.ApiResult;
 import com.foxinmy.weixin4j.http.message.JsonMessageConverter;
 import com.foxinmy.weixin4j.http.message.MessageConverter;
 import com.foxinmy.weixin4j.http.message.XmlMessageConverter;
-import com.foxinmy.weixin4j.http.message.XmlResult;
 import com.foxinmy.weixin4j.util.StringUtil;
 
 /**

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/XmlResult.java

@@ -1,4 +1,4 @@
-package com.foxinmy.weixin4j.http.message;
+package com.foxinmy.weixin4j.http.weixin;
 
 import java.io.Serializable;
 

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml

@@ -319,6 +319,10 @@
 		<code>40094</code>
 		<text>invalid args</text>
 	</error>
+	<error>
+		<code>40095</code>
+		<text>修改失败，并发冲突</text>
+	</error>
 	<error>
 		<code>40099</code>
 		<text>卡券已被核销。</text>

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java

@@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.api.CouponApi;
 import com.foxinmy.weixin4j.api.CustomsApi;
 import com.foxinmy.weixin4j.api.PayApi;
 import com.foxinmy.weixin4j.exception.WeixinException;
-import com.foxinmy.weixin4j.http.message.XmlResult;
+import com.foxinmy.weixin4j.http.weixin.XmlResult;
 import com.foxinmy.weixin4j.model.Pageable;
 import com.foxinmy.weixin4j.model.WeixinPayAccount;
 import com.foxinmy.weixin4j.payment.coupon.CouponDetail;

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MerchantResult.java

@@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.foxinmy.weixin4j.http.message.XmlResult;
+import com.foxinmy.weixin4j.http.weixin.XmlResult;
 import com.foxinmy.weixin4j.type.SignType;
 
 /**

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java

@@ -11,7 +11,7 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.foxinmy.weixin4j.http.message.XmlResult;
+import com.foxinmy.weixin4j.http.weixin.XmlResult;
 import com.foxinmy.weixin4j.type.RedpacketSendType;
 import com.foxinmy.weixin4j.type.RedpacketStatus;
 import com.foxinmy.weixin4j.type.RedpacketType;