niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ApiResult调整位置

Browse Source
This commit is contained in:
jinyu 2016-08-01 10:39:35 +08:00
parent 2ff6a0f4e4
commit 92cc725f41
12 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/message/ApiResult.java → weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/ApiResult.java
View File

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

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

@ -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;

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

@ -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;
/**

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/message/XmlResult.java → weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/XmlResult.java
View File

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

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

@ -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>

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

@ -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;

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

@ -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;
/**

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

@ -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;

20
weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/CashTest.java
View File

@ -3,10 +3,13 @@ package com.foxinmy.weixin4j.base.test;
import java.io.FileInputStream;
import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.model.Consts;
import com.foxinmy.weixin4j.payment.mch.CorpPayment;
import com.foxinmy.weixin4j.payment.mch.CorpPaymentRecord;
import com.foxinmy.weixin4j.payment.mch.CorpPaymentResult;
import com.foxinmy.weixin4j.payment.mch.Redpacket;
import com.foxinmy.weixin4j.payment.mch.RedpacketRecord;
@ -31,15 +34,19 @@ public class CashTest extends PayTest {
"快来领取红包吧！", "来就送钱");
RedpacketSendResult result = PAY.sendRedpack(
new FileInputStream(caFile), redpacket);
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
@Test
public void queryRedpacket() throws WeixinException, IOException {
String outTradeNo = "HB001";
RedpacketRecord record = PAY.queryRedpack(new FileInputStream(caFile),
RedpacketRecord result = PAY.queryRedpack(new FileInputStream(caFile),
outTradeNo);
System.err.println(record);
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
@Test
@ -49,12 +56,17 @@ public class CashTest extends PayTest {
CorpPaymentCheckNameType.NO_CHECK, "企业付款测试", 1d, "127.0.0.1");
CorpPaymentResult result = PAY.sendCorpPayment(new FileInputStream(
caFile), payment);
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
@Test
public void queryCorpPayment() throws WeixinException, IOException {
System.err.println(PAY.queryCorpPayment(new FileInputStream(caFile),
"MP001"));
CorpPaymentRecord result = PAY.queryCorpPayment(new FileInputStream(caFile),
"MP001");
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
}

16
weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/CouponTest.java
View File

@ -31,18 +31,24 @@ public class CouponTest extends PayTest {
DateUtil.fortmat2yyyyMMdd(new Date()), "1");
CouponResult result = PAY.sendCoupon(new FileInputStream(caFile),
"123", partnerTradeNo, "oyFLst1bqtuTcxK-ojF8hOGtLQao", null);
Assert.assertTrue(result.getRetCode().equalsIgnoreCase(Consts.SUCCESS));
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
@Test
public void queryCouponStock() throws WeixinException {
CouponStock couponStock = PAY.queryCouponStock("couponStockId");
System.err.println(couponStock);
CouponStock result = PAY.queryCouponStock("couponStockId");
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
@Test
public void queryCouponDetail() throws WeixinException {
CouponDetail couponDetail = PAY.queryCouponDetail("couponId");
System.err.println(couponDetail);
CouponDetail result = PAY.queryCouponDetail("couponId");
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
}

35
weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/PayTest.java
View File

@ -10,8 +10,8 @@ import org.junit.Assert;
import org.junit.Test;
import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.exception.WeixinPayException;
import com.foxinmy.weixin4j.http.message.XmlResult;
import com.foxinmy.weixin4j.http.weixin.XmlResult;
import com.foxinmy.weixin4j.model.Consts;
import com.foxinmy.weixin4j.model.WeixinPayAccount;
import com.foxinmy.weixin4j.payment.WeixinPayProxy;
import com.foxinmy.weixin4j.payment.mch.MchPayPackage;
@ -43,19 +43,24 @@ public class PayTest {
protected final static WeixinPayProxy PAY;
static {
ACCOUNT = new WeixinPayAccount("wx0d1d598c0c03c999", "GATFzDwbQdbbci3QEQxX2rUBvwTrsMiZ", "10020674");
ACCOUNT = new WeixinPayAccount("wx0d1d598c0c03c999",
"GATFzDwbQdbbci3QEQxX2rUBvwTrsMiZ", "10020674");
SIGNATURE = new WeixinPaymentSignature(ACCOUNT.getPaySignKey());
PAY = new WeixinPayProxy(new Weixin4jSettings<WeixinPayAccount>(ACCOUNT));
PAY = new WeixinPayProxy(
new Weixin4jSettings<WeixinPayAccount>(ACCOUNT));
}
/**
* 商户证书文件
*/
protected File caFile = new File("/Users/jy/workspace/feican/canyi-weixin-parent/canyi-weixin-service/src/main/resources/10020674.p12");
protected File caFile = new File(
"/Users/jy/workspace/feican/canyi-weixin-parent/canyi-weixin-service/src/main/resources/10020674.p12");
@Test
public void queryOrder() throws WeixinException {
Order order = PAY.queryOrder(new IdQuery("BY2016010800025",
IdType.TRADENO));
Assert.assertEquals(Consts.SUCCESS, order.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, order.getResultCode());
System.err.println(order);
String sign = order.getSign();
order.setSign(null);
@ -69,8 +74,9 @@ public class PayTest {
public void queryRefund() throws WeixinException {
RefundRecord record = PAY.queryRefund(new IdQuery("TT_1427183696238",
IdType.TRADENO));
Assert.assertEquals(Consts.SUCCESS, record.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, record.getResultCode());
System.err.println(record);
// 这里的验证签名需要把details循环拼接
String sign = record.getSign();
record.setSign(null);
String valiSign = SIGNATURE.sign(record);
@ -96,6 +102,8 @@ public class PayTest {
RefundResult result = PAY.applyRefund(new FileInputStream(caFile),
idQuery, "TT_R" + System.currentTimeMillis(), 0.01d, 0.01d,
null, "10020674");
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
String sign = result.getSign();
result.setSign(null);
@ -110,18 +118,17 @@ public class PayTest {
MchPayPackage payPackageV3 = new MchPayPackage("native测试", "T0001",
0.1d, "notify_url", "127.0.0.1", TradeType.NATIVE, null, null,
"productId", null);
PrePay prePay = null;
try {
prePay = PAY.createPrePay(payPackageV3);
} catch (WeixinPayException e) {
e.printStackTrace();
}
System.err.println(prePay);
PrePay result = PAY.createPrePay(payPackageV3);
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
}
@Test
public void closeOrder() throws WeixinException {
MerchantResult result = PAY.closeOrder("D111");
Assert.assertEquals(Consts.SUCCESS, result.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, result.getResultCode());
System.err.println(result);
String sign = result.getSign();
result.setSign(null);
@ -149,6 +156,8 @@ public class PayTest {
returnXml.setResultCode("SUCCESS");
returnXml = PAY.reportInterface(interfaceUrl, executeTime, outTradeNo,
ip, time, returnXml);
Assert.assertEquals(Consts.SUCCESS, returnXml.getReturnCode());
Assert.assertEquals(Consts.SUCCESS, returnXml.getResultCode());
System.err.println(returnXml);
}