From daafd450a065883282189012cd45505b8882ef37 Mon Sep 17 00:00:00 2001 From: jinyu Date: Thu, 4 Jun 2015 17:45:35 +0800 Subject: [PATCH] add no-arg default constructor for xmlbeans --- .../com/foxinmy/weixin4j/xml/XmlStream.java | 1 + .../weixin4j/mp/payment/JsPayNotify.java | 4 ++ .../weixin4j/mp/payment/MicroPayPackage.java | 4 ++ .../weixin4j/mp/payment/PayPackage.java | 5 +- .../mp/payment/coupon/CouponDetail.java | 4 ++ .../mp/payment/coupon/CouponInfo.java | 4 ++ .../mp/payment/coupon/CouponResult.java | 5 +- .../mp/payment/coupon/CouponStock.java | 4 ++ .../weixin4j/mp/payment/v2/ApiResult.java | 4 ++ .../mp/payment/v2/JsPayRequestV2.java | 4 ++ .../mp/payment/v2/NativePayNotifyV2.java | 8 +-- .../mp/payment/v2/NativePayResponseV2.java | 4 ++ .../foxinmy/weixin4j/mp/payment/v2/Order.java | 6 -- .../weixin4j/mp/payment/v2/PayFeedback.java | 4 ++ .../weixin4j/mp/payment/v2/PayPackageV2.java | 4 ++ .../weixin4j/mp/payment/v2/PayWarn.java | 4 ++ .../weixin4j/mp/payment/v2/RefundDetail.java | 4 ++ .../weixin4j/mp/payment/v2/RefundRecord.java | 4 ++ .../weixin4j/mp/payment/v2/RefundResult.java | 4 ++ .../weixin4j/mp/payment/v3/ApiResult.java | 2 +- .../weixin4j/mp/payment/v3/MPPayment.java | 4 ++ .../mp/payment/v3/MPPaymentResult.java | 4 ++ .../mp/payment/v3/NativePayNotifyV3.java | 8 +-- .../mp/payment/v3/NativePayResponseV3.java | 4 ++ .../foxinmy/weixin4j/mp/payment/v3/Order.java | 4 ++ .../weixin4j/mp/payment/v3/PayPackageV3.java | 4 ++ .../weixin4j/mp/payment/v3/PayRequestV3.java | 4 ++ .../weixin4j/mp/payment/v3/PrePay.java | 4 +- .../weixin4j/mp/payment/v3/Redpacket.java | 71 ++++++++++--------- .../mp/payment/v3/RedpacketSendResult.java | 4 ++ .../weixin4j/mp/payment/v3/RefundDetail.java | 4 ++ .../weixin4j/mp/payment/v3/RefundRecord.java | 4 ++ .../weixin4j/mp/payment/v3/RefundResult.java | 4 ++ .../foxinmy/weixin4j/mp/test/CashTest.java | 8 +-- 34 files changed, 153 insertions(+), 61 deletions(-) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java index 27d2ac49..462e0100 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java @@ -247,6 +247,7 @@ public final class XmlStream { try { JAXBContext jaxbContext = JAXBContext.newInstance(clazz); marshaller = jaxbContext.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_ENCODING, Consts.UTF_8.name()); messageMarshaller.put(clazz, marshaller); } catch (JAXBException e) { throw new IllegalArgumentException(e); diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/JsPayNotify.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/JsPayNotify.java index 759b98ee..49e41170 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/JsPayNotify.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/JsPayNotify.java @@ -33,6 +33,10 @@ public class JsPayNotify extends PayBaseInfo { @XmlElement(name = "IsSubscribe") private int issubscribe; + public JsPayNotify() { + + } + public String getOpenid() { return openid; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java index 43333e1a..327417e7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java @@ -58,6 +58,10 @@ public class MicroPayPackage extends PayPackage { @JSONField(name = "auth_code") private String authCode; + protected MicroPayPackage(){ + // jaxb required + } + public MicroPayPackage(WeixinMpAccount weixinAccount, String body, String attach, String outTradeNo, double totalFee, String spbillCreateIp, String authCode) { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java index 80623386..64e2595d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java @@ -179,9 +179,10 @@ public class PayPackage implements Serializable { this.notifyUrl = notifyUrl; } - public PayPackage() { + protected PayPackage(){ + // jaxb required } - + /** * 订单对象 * diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponDetail.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponDetail.java index 19f7981e..2b2bc953 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponDetail.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponDetail.java @@ -173,6 +173,10 @@ public class CouponDetail extends ApiResult { @JSONField(name = "is_partial_use") private int isPartialUse; + public CouponDetail(){ + + } + public String getCouponStockId() { return couponStockId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponInfo.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponInfo.java index 95e99acd..04c5a332 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponInfo.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponInfo.java @@ -43,6 +43,10 @@ public class CouponInfo implements Serializable { @JSONField(name = "coupon_fee") private Integer couponFee; + public CouponInfo(){ + + } + public String getCouponBatchId() { return couponBatchId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponResult.java index c1b289cb..3354cb08 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponResult.java @@ -72,11 +72,14 @@ public class CouponResult extends ApiResult { @JSONField(name = "ret_msg") private String retMsg; + public CouponResult(){ + + } + public String getCouponStockId() { return couponStockId; } - public int getResponseCount() { return responseCount; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponStock.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponStock.java index 31ecf7aa..73ef13ed 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponStock.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/coupon/CouponStock.java @@ -119,6 +119,10 @@ public class CouponStock extends ApiResult { @JSONField(name = "coupon_budget") private Integer couponBudget; + public CouponStock(){ + + } + public String getCouponStockId() { return couponStockId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResult.java index df7c7a43..dcb59426 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResult.java @@ -64,6 +64,10 @@ public class ApiResult implements Serializable { @XmlElement(name = "sign_type") private SignType signType; + protected ApiResult(){ + // jaxb required + } + public int getRetCode() { return retCode; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java index 935ed80a..4a3c0885 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java @@ -33,6 +33,10 @@ public class JsPayRequestV2 extends PayRequest { private static final long serialVersionUID = -5972173459255255197L; + protected JsPayRequestV2(){ + // jaxb required + } + public JsPayRequestV2(WeixinMpAccount weixinAccount, PayPackageV2 payPackage) { this.setAppId(weixinAccount.getId()); this.setPackageInfo(package2string(payPackage, diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java index 158a54e0..dab48ea8 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java @@ -28,14 +28,14 @@ public class NativePayNotifyV2 extends JsPayNotify { @XmlElement(name = "ProductId") private String productId; + private NativePayNotifyV2(){ + // jaxb required + } + public String getProductId() { return productId; } - public void setProductId(String productId) { - this.productId = productId; - } - @Override public String toString() { return "NativePayNotifyV2 [productId=" + productId + ", " diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java index 3819c815..7461e54e 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java @@ -32,6 +32,10 @@ public class NativePayResponseV2 extends JsPayRequestV2 { @XmlElement(name = "RetErrMsg") private String retMsg; + protected NativePayResponseV2(){ + // jaxb required + } + public NativePayResponseV2(WeixinMpAccount weixinAccount, PayPackageV2 payPackage) { super(weixinAccount, payPackage); diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/Order.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/Order.java index 280eb845..a2ecd570 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/Order.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/Order.java @@ -2,10 +2,6 @@ package com.foxinmy.weixin4j.mp.payment.v2; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import com.alibaba.fastjson.annotation.JSONField; import com.foxinmy.weixin4j.mp.type.CurrencyType; import com.foxinmy.weixin4j.mp.type.TradeState; @@ -20,8 +16,6 @@ import com.foxinmy.weixin4j.util.DateUtil; * @since JDK 1.7 * @see */ -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class Order extends ApiResult { private static final long serialVersionUID = 4543552984506609920L; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java index eec7603f..fd7f3975 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java @@ -63,6 +63,10 @@ public class PayFeedback extends PayBaseInfo { @XmlElement(name = "MsgType") private String status; + public PayFeedback() { + + } + public String getFeedbackId() { return feedbackId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java index 42be3957..6d14ad61 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java @@ -61,6 +61,10 @@ public class PayPackageV2 extends PayPackage { @JSONField(name = "input_charset") private String inputCharset; + protected PayPackageV2() { + // jaxb required + } + public PayPackageV2(String outTradeNo, double totalFee, String spbillCreateIp) { this(null, null, null, outTradeNo, totalFee, null, spbillCreateIp, diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java index f25fb35c..5b566b81 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java @@ -38,6 +38,10 @@ public class PayWarn extends PayBaseInfo { @XmlElement(name = "AlarmContent") private String alarmcontent; + public PayWarn() { + + } + public String getErrortype() { return errortype; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetail.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetail.java index 8831cf5e..517538d9 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetail.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetail.java @@ -68,6 +68,10 @@ public class RefundDetail extends ApiResult { @JSONField(name = "reccv_user_name") private String reccvUserName; + protected RefundDetail() { + // jaxb required + } + public String getOutRefundNo() { return outRefundNo; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecord.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecord.java index 741bea74..56c5f641 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecord.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecord.java @@ -50,6 +50,10 @@ public class RefundRecord extends ApiResult { @JSONField(serialize = false, deserialize = false) private List refundList; + protected RefundRecord() { + // jaxb required + } + public String getTransactionId() { return transactionId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResult.java index 5ec8eaf0..27f235bd 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResult.java @@ -35,6 +35,10 @@ public class RefundResult extends RefundDetail { @JSONField(name = "out_trade_no") private String outTradeNo; + protected RefundResult() { + // jaxb required + } + public String getTransactionId() { return transactionId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/ApiResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/ApiResult.java index 346b9a9b..3cd6804f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/ApiResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/ApiResult.java @@ -63,7 +63,7 @@ public class ApiResult extends XmlResult { */ private String recall; - public ApiResult() { + protected ApiResult() { } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPayment.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPayment.java index f06d232b..ab7080e6 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPayment.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPayment.java @@ -64,6 +64,10 @@ public class MPPayment implements Serializable { @JSONField(name = "spbill_create_ip") private String clientIp; + protected MPPayment() { + // jaxb required + } + /** * 企业付款 * @param outTradeNo 商户的订单号 diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPaymentResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPaymentResult.java index 9d542d4c..5a8ee8e8 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPaymentResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/MPPaymentResult.java @@ -41,6 +41,10 @@ public class MPPaymentResult extends ApiResult { @XmlElement(name = "payment_time") private String paymentTime; + protected MPPaymentResult() { + // jaxb required + } + public String getTransactionId() { return transactionId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayNotifyV3.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayNotifyV3.java index 3405be65..57181205 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayNotifyV3.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayNotifyV3.java @@ -26,14 +26,14 @@ public class NativePayNotifyV3 extends ApiResult { @XmlElement(name = "product_id") private String productId; + protected NativePayNotifyV3() { + // jaxb required + } + public String getProductId() { return productId; } - public void setProductId(String productId) { - this.productId = productId; - } - @Override public String toString() { return "NativePayNotifyV3 [productId=" + productId + ", " diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayResponseV3.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayResponseV3.java index 0442dda9..bbd41580 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayResponseV3.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/NativePayResponseV3.java @@ -32,6 +32,10 @@ public class NativePayResponseV3 extends ApiResult { private String prepay_id; + protected NativePayResponseV3() { + // jaxb required + } + /** * 一般作为校验失败时返回 * diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Order.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Order.java index 177cbc4d..08c2d090 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Order.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Order.java @@ -132,6 +132,10 @@ public class Order extends ApiResult { @JSONField(name = "trade_state_desc") private String tradeStateDesc; + protected Order() { + // jaxb required + } + public TradeState getTradeState() { return tradeState; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java index ea5f63b5..3242ef69 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java @@ -71,6 +71,10 @@ public class PayPackageV3 extends PayPackage { @JSONField(name = "product_id") private String productId; + protected PayPackageV3() { + // jaxb required + } + public PayPackageV3(WeixinMpAccount weixinAccount, String openId, String body, String outTradeNo, double totalFee, String spbillCreateIp, TradeType tradeType) { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayRequestV3.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayRequestV3.java index 3b43962c..9768db86 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayRequestV3.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayRequestV3.java @@ -30,6 +30,10 @@ public class PayRequestV3 extends PayRequest { private static final long serialVersionUID = -5972173459255255197L; + protected PayRequestV3() { + // jaxb required + } + public PayRequestV3(PrePay prePay) throws PayException { this.setAppId(prePay.getAppId()); this.setPackageInfo("prepay_id=" + prePay.getPrepayId()); diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PrePay.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PrePay.java index 9d84bc2c..729a228f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PrePay.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PrePay.java @@ -40,8 +40,8 @@ public class PrePay extends ApiResult { @XmlElement(name = "code_url") private String codeUrl; - public PrePay() { - + protected PrePay() { + // jaxb required } public PrePay(String returnCode, String returnMsg) { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Redpacket.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Redpacket.java index 975f7852..c267aeeb 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Redpacket.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/Redpacket.java @@ -118,52 +118,53 @@ public class Redpacket implements Serializable { @JSONField(name = "share_imgurl") private String shareImageUrl; - public String getOutTradeNo() { - return outTradeNo; + protected Redpacket() { + // jaxb required } - public void setOutTradeNo(String outTradeNo) { + /** + * 红包 + * + * @param outTradeNo + * 商户侧一天内不可重复的订单号 接口根据商户订单号支持重入 如出现超时可再调用 + * @param nickName + * 提供方名称 + * @param sendName + * 红包发送者名称 + * @param openid + * 接受收红包的用户的openid + * @param totalAmount + * 付款金额 单位为元,自动格式化为分 + */ + public Redpacket(String outTradeNo, String nickName, String sendName, + String openid, double totalAmount) { this.outTradeNo = outTradeNo; + this.nickName = nickName; + this.sendName = sendName; + this.openid = openid; + this.totalAmount = DateUtil.formaFee2Fen(totalAmount); + } + + public String getOutTradeNo() { + return outTradeNo; } public String getNickName() { return nickName; } - public void setNickName(String nickName) { - this.nickName = nickName; - } - public String getSendName() { return sendName; } - public void setSendName(String sendName) { - this.sendName = sendName; - } - public String getOpenid() { return openid; } - public void setOpenid(String openid) { - this.openid = openid; - } - public String getTotalAmount() { return totalAmount; } - /** - * 单位为元,自动格式化为分 - * - * @param totalAmount - * 付款金额 单位为元 - */ - public void setTotalAmount(double totalAmount) { - this.totalAmount = DateUtil.formaFee2Fen(totalAmount); - } - public String getMinValue() { return minValue; } @@ -172,7 +173,7 @@ public class Redpacket implements Serializable { * 单位为元,自动格式化为分 * * @param minValue - * 最小红包 单位为元 + * 最小红包 单位为元 */ public void setMinValue(double minValue) { this.minValue = DateUtil.formaFee2Fen(minValue); @@ -186,7 +187,7 @@ public class Redpacket implements Serializable { * 单位为元,自动格式化为分 * * @param minValue - * 最大红包 单位为元 + * 最大红包 单位为元 */ public void setMaxValue(double maxValue) { this.maxValue = DateUtil.formaFee2Fen(maxValue); @@ -266,13 +267,13 @@ public class Redpacket implements Serializable { @Override public String toString() { - return "Redpacket [ nickName=" + nickName - + ", sendName=" + sendName + ", openid=" + openid - + ", totalAmount=" + totalAmount + ", minValue=" + minValue - + ", maxValue=" + maxValue + ", totalNum=" + totalNum - + ", wishing=" + wishing + ", clientIp=" + clientIp - + ", actName=" + actName + ", remark=" + remark + ", logoUrl=" - + logoUrl + ", shareContent=" + shareContent + ", shareUrl=" - + shareUrl + ", shareImageUrl=" + shareImageUrl + "]"; + return "Redpacket [ nickName=" + nickName + ", sendName=" + sendName + + ", openid=" + openid + ", totalAmount=" + totalAmount + + ", minValue=" + minValue + ", maxValue=" + maxValue + + ", totalNum=" + totalNum + ", wishing=" + wishing + + ", clientIp=" + clientIp + ", actName=" + actName + + ", remark=" + remark + ", logoUrl=" + logoUrl + + ", shareContent=" + shareContent + ", shareUrl=" + shareUrl + + ", shareImageUrl=" + shareImageUrl + "]"; } } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RedpacketSendResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RedpacketSendResult.java index 34a31773..b22e0a9d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RedpacketSendResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RedpacketSendResult.java @@ -53,6 +53,10 @@ public class RedpacketSendResult extends XmlResult { @JSONField(name = "total_amount") private int totalAmount; + protected RedpacketSendResult() { + // jaxb required + } + public String getAppid() { return appid; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundDetail.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundDetail.java index 5e98eedc..7aff5d79 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundDetail.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundDetail.java @@ -133,6 +133,10 @@ public class RefundDetail extends ApiResult { @JSONField(serialize = false, deserialize = false) private List couponList; + protected RefundDetail() { + // jaxb required + } + public String getOutRefundNo() { return outRefundNo; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundRecord.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundRecord.java index 23bfa50f..14eff9d0 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundRecord.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundRecord.java @@ -92,6 +92,10 @@ public class RefundRecord extends ApiResult { @JSONField(serialize = false, deserialize = false) private List refundList; + protected RefundRecord() { + // jaxb required + } + public String getTransactionId() { return transactionId; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundResult.java index 00c01bdd..cb7007c7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/RefundResult.java @@ -35,6 +35,10 @@ public class RefundResult extends RefundDetail { @JSONField(name = "out_trade_no") private String outTradeNo; + protected RefundResult() { + // jaxb required + } + public String getTransactionId() { return transactionId; } diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java index ccbcbcd4..c5cc66cc 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java @@ -22,17 +22,13 @@ public class CashTest extends CouponTest { @Test public void sendRedpacket() throws WeixinException { - Redpacket redpacket = new Redpacket(); + Redpacket redpacket = new Redpacket("HB001", "无忧钱庄", "无忧钱庄", + "oyFLst1bqtuTcxK-ojF8hOGtLQao", 1d); redpacket.setActName("红包测试"); redpacket.setClientIp("127.0.0.1"); redpacket.setMaxValue(1d); redpacket.setMinValue(1d); - redpacket.setNickName("无忧钱庄"); - redpacket.setOpenid("oyFLst1bqtuTcxK-ojF8hOGtLQao"); - redpacket.setOutTradeNo("HB001"); redpacket.setRemark("快来领取红包吧！"); - redpacket.setSendName("无忧钱庄"); - redpacket.setTotalAmount(1d); redpacket.setTotalNum(1); redpacket.setWishing("来就送钱"); RedpacketSendResult result = WEIXINPAY.sendRedpack(caFile, redpacket);