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

update something..

Browse Source
This commit is contained in:
jinyu 2015-06-28 09:44:10 +08:00
parent 0b35861009
commit 18c18b38eb
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java
View File

@ -155,7 +155,7 @@ public class CashApi {
* href="http://pay.weixin.qq.com/wiki/doc/api/mch_pay.php?chapter=14_1">企业付款</a>
* @throws WeixinException
*/
public MPPaymentResult mpPayment(File caFile, MPPayment mpPayment)
public MPPaymentResult mchPayment(File caFile, MPPayment mpPayment)
throws WeixinException {
JSONObject obj = (JSONObject) JSON.toJSON(mpPayment);
obj.put("nonce_str", RandomUtil.generateString(16));
@ -207,7 +207,7 @@ public class CashApi {
* href="http://pay.weixin.qq.com/wiki/doc/api/mch_pay.php?chapter=14_3">企业付款查询</a>
* @throws WeixinException
*/
public MPPaymentRecord mpPaymentQuery(File caFile, String outTradeNo)
public MPPaymentRecord mchPaymentQuery(File caFile, String outTradeNo)
throws WeixinException {
JSONObject obj = new JSONObject();
obj.put("nonce_str", RandomUtil.generateString(16));

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

@ -448,7 +448,7 @@ public class WeixinPayProxy {
*/
public MPPaymentResult mpPayment(File caFile, MPPayment mpPayment)
throws WeixinException {
return cashApi.mpPayment(caFile, mpPayment);
return cashApi.mchPayment(caFile, mpPayment);
}
/**
@ -458,7 +458,7 @@ public class WeixinPayProxy {
*/
public MPPaymentResult mpPayment(MPPayment mpPayment)
throws WeixinException {
return cashApi.mpPayment(DEFAULT_CA_FILE, mpPayment);
return cashApi.mchPayment(DEFAULT_CA_FILE, mpPayment);
}
/**
@ -477,7 +477,7 @@ public class WeixinPayProxy {
*/
public MPPaymentRecord mpPaymentQuery(File caFile, String outTradeNo)
throws WeixinException {
return cashApi.mpPaymentQuery(caFile, outTradeNo);
return cashApi.mchPaymentQuery(caFile, outTradeNo);
}
/**
@ -487,6 +487,6 @@ public class WeixinPayProxy {
*/
public MPPaymentRecord mpPaymentQuery(String outTradeNo)
throws WeixinException {
return cashApi.mpPaymentQuery(DEFAULT_CA_FILE, outTradeNo);
return cashApi.mchPaymentQuery(DEFAULT_CA_FILE, outTradeNo);
}
}

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

@ -53,6 +53,7 @@ public class MPPaymentRecord extends ApiResult {
/**
* 收款用户openid
*/
@XmlElement(name = "openid")
private String openid;
/**
* 收款用户姓名
@ -83,6 +84,7 @@ public class MPPaymentRecord extends ApiResult {
/**
* 企业付款描述信息
*/
@XmlElement(name = "desc")
private String desc;
/**
* 实名验证结果 PASS:通过 FAILED:不通过

1
weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ObjectId.java
View File

@ -274,7 +274,6 @@ public class ObjectId implements Comparable<ObjectId>, java.io.Serializable {
private static final int _genmachine;
static {
try {
// build a 2-byte machine piece based on NICs info
int machinePiece;

4
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java
View File

@ -107,7 +107,7 @@ public class MediaApi extends MpApi {
*/
public String uploadMedia(InputStream is, MediaType mediaType,
boolean isMaterial) throws WeixinException {
if (mediaType.equals(MediaType.video.name()) && isMaterial) {
if (mediaType == MediaType.video && isMaterial) {
throw new WeixinException(
"please invoke uploadMaterialVideo method");
}
@ -133,7 +133,7 @@ public class MediaApi extends MpApi {
.toHexString())));
}
} catch (UnsupportedEncodingException e) {
; // ignore
throw new WeixinException(e);
} finally {
try {
is.close();