diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java index 30896849..cb587710 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java @@ -155,7 +155,7 @@ public class CashApi { * href="http://pay.weixin.qq.com/wiki/doc/api/mch_pay.php?chapter=14_1">企业付款 * @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">企业付款查询 * @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)); diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java index f761896e..f53bd50e 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java @@ -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); } } diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java index 9575aada..c88a13e2 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java @@ -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:不通过 diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ObjectId.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ObjectId.java index ccdd95b4..fcdf847c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ObjectId.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ObjectId.java @@ -274,7 +274,6 @@ public class ObjectId implements Comparable, java.io.Serializable { private static final int _genmachine; static { - try { // build a 2-byte machine piece based on NICs info int machinePiece; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java index 218ca1e8..3c5b8fc7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java @@ -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();