diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java index 40631c48..3515fb2b 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java @@ -8,7 +8,6 @@ package com.foxinmy.weixin4j.type.mch; * @date 2015年4月1日 * @since JDK 1.6 * @see - * @deprecated 迁移到子模块weixin4j-pay */ @Deprecated public enum CorpPaymentCheckNameType { diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/JsPayNotify.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/JsPayNotify.java index 14af1807..00ef75ab 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/JsPayNotify.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/JsPayNotify.java @@ -43,10 +43,18 @@ public class JsPayNotify extends PayBaseInfo { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public int getIsSubscribe() { return isSubscribe; } + public void setIsSubscribe(int isSubscribe) { + this.isSubscribe = isSubscribe; + } + @JSONField(serialize = false) public boolean getFormatIsSubscribe() { return isSubscribe == 1; diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayPackage.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayPackage.java index aa8b59f5..980a1398 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayPackage.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayPackage.java @@ -81,7 +81,7 @@ public class PayPackage extends MerchantResult { @JSONField(name = "goods_tag") private String goodsTag; - public PayPackage() { + protected PayPackage() { // jaxb required } @@ -194,6 +194,10 @@ public class PayPackage extends MerchantResult { public int getTotalFee() { return totalFee; } + + public void setTotalFee(int totalFee) { + this.totalFee = totalFee; + } /** * 调用接口获取单位为分,get方法转换为元方便使用 diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayRequest.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayRequest.java index 2672b767..365bf49c 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayRequest.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayRequest.java @@ -33,7 +33,7 @@ public class PayRequest extends PayBaseInfo { private String partnerId; - public PayRequest() { + protected PayRequest() { // jaxb required } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponDetail.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponDetail.java index 949e02bb..84a25107 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponDetail.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponDetail.java @@ -178,10 +178,18 @@ public class CouponDetail extends MerchantResult { return couponStockId; } + public void setCouponStockId(String couponStockId) { + this.couponStockId = couponStockId; + } + public int getCouponStockType() { return couponStockType; } + public void setCouponStockType(int couponStockType) { + this.couponStockType = couponStockType; + } + @JSONField(serialize = false) public CouponStockType getFormatCouponStockType() { for (CouponStockType couponStockType : CouponStockType.values()) { @@ -196,10 +204,18 @@ public class CouponDetail extends MerchantResult { return couponId; } + public void setCouponId(String couponId) { + this.couponId = couponId; + } + public int getCouponValue() { return couponValue; } + public void setCouponValue(int couponValue) { + this.couponValue = couponValue; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -214,6 +230,10 @@ public class CouponDetail extends MerchantResult { return couponMininum; } + public void setCouponMininum(int couponMininum) { + this.couponMininum = couponMininum; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -228,10 +248,18 @@ public class CouponDetail extends MerchantResult { return couponName; } + public void setCouponName(String couponName) { + this.couponName = couponName; + } + public int getCouponStatus() { return couponStatus; } + public void setCouponStatus(int couponStatus) { + this.couponStatus = couponStatus; + } + @JSONField(serialize = false) public CouponStatus getFormatCouponStatus() { for (CouponStatus couponStatus : CouponStatus.values()) { @@ -246,6 +274,10 @@ public class CouponDetail extends MerchantResult { return couponType; } + public void setCouponType(int couponType) { + this.couponType = couponType; + } + @JSONField(deserialize = false, serialize = false) public CouponType getFormatCouponType() { for (CouponType couponType : CouponType.values()) { @@ -260,10 +292,18 @@ public class CouponDetail extends MerchantResult { return couponDesc; } + public void setCouponDesc(String couponDesc) { + this.couponDesc = couponDesc; + } + public int getCouponUseValue() { return couponUseValue; } + public void setCouponUseValue(int couponUseValue) { + this.couponUseValue = couponUseValue; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -288,10 +328,18 @@ public class CouponDetail extends MerchantResult { return couponRemainValue / 100d; } + public void setCouponRemainValue(int couponRemainValue) { + this.couponRemainValue = couponRemainValue; + } + public String getBeginTime() { return beginTime; } + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + @JSONField(serialize = false) public Date getFormatBeginTime() { return beginTime != null ? DateUtil.parse2yyyyMMddHHmmss(beginTime) @@ -302,6 +350,10 @@ public class CouponDetail extends MerchantResult { return endTime; } + public void setEndTime(String endTime) { + this.endTime = endTime; + } + @JSONField(serialize = false) public Date getFormatEndTime() { return endTime != null ? DateUtil.parse2yyyyMMddHHmmss(endTime) : null; @@ -311,6 +363,10 @@ public class CouponDetail extends MerchantResult { return sendTime; } + public void setSendTime(String sendTime) { + this.sendTime = sendTime; + } + @JSONField(serialize = false) public Date getFormatSendTime() { return sendTime != null ? DateUtil.parse2yyyyMMddHHmmss(sendTime) @@ -326,26 +382,50 @@ public class CouponDetail extends MerchantResult { return useTime != null ? DateUtil.parse2yyyyMMddHHmmss(useTime) : null; } + public void setUseTime(String useTime) { + this.useTime = useTime; + } + public String getTradeNo() { return tradeNo; } + public void setTradeNo(String tradeNo) { + this.tradeNo = tradeNo; + } + public String getConsumerMchId() { return consumerMchId; } + public void setConsumerMchId(String consumerMchId) { + this.consumerMchId = consumerMchId; + } + public String getConsumerMchName() { return consumerMchName; } + public void setConsumerMchName(String consumerMchName) { + this.consumerMchName = consumerMchName; + } + public String getConsumerMchAppid() { return consumerMchAppid; } + public void setConsumerMchAppid(String consumerMchAppid) { + this.consumerMchAppid = consumerMchAppid; + } + public String getSendSource() { return sendSource; } + public void setSendSource(String sendSource) { + this.sendSource = sendSource; + } + public int getIsPartialUse() { return isPartialUse; } @@ -355,6 +435,10 @@ public class CouponDetail extends MerchantResult { return isPartialUse == 1; } + public void setIsPartialUse(int isPartialUse) { + this.isPartialUse = isPartialUse; + } + @Override public String toString() { return "CouponDetail [couponStockId=" + couponStockId diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponResult.java index afe82022..697a3ff3 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponResult.java @@ -80,18 +80,38 @@ public class CouponResult extends MerchantResult { return couponStockId; } + public void setCouponStockId(String couponStockId) { + this.couponStockId = couponStockId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + public int getResponseCount() { return responseCount; } + public void setResponseCount(int responseCount) { + this.responseCount = responseCount; + } + public int getSuccessCount() { return successCount; } + public void setSuccessCount(int successCount) { + this.successCount = successCount; + } + public int getFailedCount() { return failedCount; } + public void setFailedCount(int failedCount) { + this.failedCount = failedCount; + } + public String getOpenId() { return openId; } @@ -100,14 +120,26 @@ public class CouponResult extends MerchantResult { return retCode; } + public void setRetCode(String retCode) { + this.retCode = retCode; + } + public String getCouponId() { return couponId; } + public void setCouponId(String couponId) { + this.couponId = couponId; + } + public String getRetMsg() { return retMsg; } + public void setRetMsg(String retMsg) { + this.retMsg = retMsg; + } + @Override public String toString() { return "CouponResult [couponStockId=" + couponStockId diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponStock.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponStock.java index d1d2be64..0d8e5288 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponStock.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponStock.java @@ -126,14 +126,26 @@ public class CouponStock extends MerchantResult { return couponStockId; } + public void setCouponStockId(String couponStockId) { + this.couponStockId = couponStockId; + } + public String getCouponName() { return couponName; } + public void setCouponName(String couponName) { + this.couponName = couponName; + } + public int getCouponValue() { return couponValue; } + public void setCouponValue(int couponValue) { + this.couponValue = couponValue; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -148,6 +160,10 @@ public class CouponStock extends MerchantResult { return couponMininumn; } + public void setCouponMininumn(Integer couponMininumn) { + this.couponMininumn = couponMininumn; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -172,6 +188,10 @@ public class CouponStock extends MerchantResult { return null; } + public void setCouponType(int couponType) { + this.couponType = couponType; + } + public int getCouponStockStatus() { return couponStockStatus; } @@ -186,14 +206,26 @@ public class CouponStock extends MerchantResult { return null; } + public void setCouponStockStatus(int couponStockStatus) { + this.couponStockStatus = couponStockStatus; + } + public int getCouponTotal() { return couponTotal; } + public void setCouponTotal(int couponTotal) { + this.couponTotal = couponTotal; + } + public Integer getMaxQuota() { return maxQuota; } + public void setMaxQuota(Integer maxQuota) { + this.maxQuota = maxQuota; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -208,6 +240,10 @@ public class CouponStock extends MerchantResult { return lockedNum; } + public void setLockedNum(Integer lockedNum) { + this.lockedNum = lockedNum; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -222,6 +258,10 @@ public class CouponStock extends MerchantResult { return usedNum; } + public void setUsedNum(Integer usedNum) { + this.usedNum = usedNum; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -236,6 +276,10 @@ public class CouponStock extends MerchantResult { return sendNum; } + public void setSendNum(Integer sendNum) { + this.sendNum = sendNum; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -250,6 +294,10 @@ public class CouponStock extends MerchantResult { return beginTime; } + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + @JSONField(serialize = false) public Date getFormatBeginTime() { return beginTime != null ? DateUtil.parse2yyyyMMddHHmmss(beginTime) @@ -260,6 +308,10 @@ public class CouponStock extends MerchantResult { return endTime; } + public void setEndTime(String endTime) { + this.endTime = endTime; + } + @JSONField(serialize = false) public Date getFormatEndTime() { return endTime != null ? DateUtil.parse2yyyyMMddHHmmss(endTime) : null; @@ -269,6 +321,10 @@ public class CouponStock extends MerchantResult { return createTime; } + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + @JSONField(serialize = false) public Date getFormatCreateTime() { return createTime != null ? DateUtil.parse2yyyyMMddHHmmss(createTime) @@ -279,6 +335,10 @@ public class CouponStock extends MerchantResult { return couponBudget; } + public void setCouponBudget(Integer couponBudget) { + this.couponBudget = couponBudget; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/OrderCouponInfo.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/OrderCouponInfo.java index 747e1c2d..cbdfa2a8 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/OrderCouponInfo.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/OrderCouponInfo.java @@ -51,7 +51,7 @@ public class OrderCouponInfo implements Serializable { @JSONField(name = "coupon_fee") private Integer couponFee; - public OrderCouponInfo() { + protected OrderCouponInfo() { // jaxb requried } @@ -59,10 +59,18 @@ public class OrderCouponInfo implements Serializable { return couponBatchId; } + public void setCouponBatchId(String couponBatchId) { + this.couponBatchId = couponBatchId; + } + public String getCouponType() { return couponType; } + public void setCouponType(String couponType) { + this.couponType = couponType; + } + @JSONField(serialize = false) public CouponType getFormatCouponType() { return couponType != null ? CouponType @@ -73,10 +81,18 @@ public class OrderCouponInfo implements Serializable { return couponId; } + public void setCouponId(String couponId) { + this.couponId = couponId; + } + public Integer getCouponFee() { return couponFee; } + public void setCouponFee(Integer couponFee) { + this.couponFee = couponFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/RefundCouponInfo.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/RefundCouponInfo.java index cbba5c5d..48afd85f 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/RefundCouponInfo.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/RefundCouponInfo.java @@ -42,7 +42,7 @@ public class RefundCouponInfo implements Serializable { @JSONField(name = "coupon_refund_fee") private Integer couponFee; - public RefundCouponInfo() { + protected RefundCouponInfo() { // jaxb requried } @@ -50,14 +50,26 @@ public class RefundCouponInfo implements Serializable { return couponBatchId; } + public void setCouponBatchId(String couponBatchId) { + this.couponBatchId = couponBatchId; + } + public String getCouponId() { return couponId; } + public void setCouponId(String couponId) { + this.couponId = couponId; + } + public Integer getCouponFee() { return couponFee; } + public void setCouponFee(Integer couponFee) { + this.couponFee = couponFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPayment.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPayment.java index 311021e9..e55a27dd 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPayment.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPayment.java @@ -1,7 +1,7 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.mch.CorpPaymentCheckNameType; +import com.foxinmy.weixin4j.pay.type.mch.CorpPaymentCheckNameType; import com.foxinmy.weixin4j.util.DateUtil; import javax.xml.bind.annotation.XmlAccessType; @@ -38,7 +38,7 @@ public class CorpPayment extends MerchantResult { /** * 校验用户姓名选项 * - * @see CorpPaymentCheckNameType.type.MPPaymentCheckNameType + * @see CorpPaymentCheckNameType */ @XmlElement(name = "check_name") @JSONField(name = "check_name") @@ -64,7 +64,7 @@ public class CorpPayment extends MerchantResult { @JSONField(name = "spbill_create_ip") private String clientIp; - public CorpPayment() { + protected CorpPayment() { // jaxb required } @@ -99,25 +99,49 @@ public class CorpPayment extends MerchantResult { return outTradeNo; } + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + public String getOpenId() { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public CorpPaymentCheckNameType getCheckNameType() { return checkNameType; } + public void setCheckNameType(CorpPaymentCheckNameType checkNameType) { + this.checkNameType = checkNameType; + } + public String getUserName() { return userName; } + public void setUserName(String userName) { + this.userName = userName; + } + public String getDesc() { return desc; } + public void setDesc(String desc) { + this.desc = desc; + } + public int getAmount() { return amount; } + + public void setAmount(int amount) { + this.amount = amount; + } /** * 调用接口获取单位为分,get方法转换为元方便使用 @@ -133,8 +157,8 @@ public class CorpPayment extends MerchantResult { return clientIp; } - public void setUserName(String userName) { - this.userName = userName; + public void setClientIp(String clientIp) { + this.clientIp = clientIp; } @Override diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentRecord.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentRecord.java index 6a600c5b..1a3286eb 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentRecord.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentRecord.java @@ -1,7 +1,7 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.mch.CorpPaymentCheckNameType; +import com.foxinmy.weixin4j.pay.type.mch.CorpPaymentCheckNameType; import com.foxinmy.weixin4j.util.DateUtil; import javax.xml.bind.annotation.XmlAccessType; @@ -76,7 +76,7 @@ public class CorpPaymentRecord extends MerchantResult { /** * 校验用户姓名选项 * - * @see CorpPaymentCheckNameType.type.MPPaymentCheckNameType + * @see CorpPaymentCheckNameType */ @XmlElement(name = "check_name") @JSONField(name = "check_name") @@ -93,7 +93,7 @@ public class CorpPaymentRecord extends MerchantResult { @XmlElement(name = "check_name_result") private String checkNameResult; - public CorpPaymentRecord() { + protected CorpPaymentRecord() { // jaxb required } @@ -101,14 +101,26 @@ public class CorpPaymentRecord extends MerchantResult { return transactionId; } + public void setTransactionId(String transactionId) { + this.transactionId = transactionId; + } + public String getOutTradeNo() { return outTradeNo; } + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + public String getTransactionStatus() { return transactionStatus; } + public void setTransactionStatus(String transactionStatus) { + this.transactionStatus = transactionStatus; + } + /** * 格式化交易状态 * @@ -123,18 +135,34 @@ public class CorpPaymentRecord extends MerchantResult { return failureReason; } + public void setFailureReason(String failureReason) { + this.failureReason = failureReason; + } + public String getOpenId() { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public String getTransferName() { return transferName; } + public void setTransferName(String transferName) { + this.transferName = transferName; + } + public int getPaymentAmount() { return paymentAmount; } + public void setPaymentAmount(int paymentAmount) { + this.paymentAmount = paymentAmount; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -149,6 +177,10 @@ public class CorpPaymentRecord extends MerchantResult { return transferTime; } + public void setTransferTime(String transferTime) { + this.transferTime = transferTime; + } + /** * 格式化转账时间 * @@ -164,6 +196,10 @@ public class CorpPaymentRecord extends MerchantResult { return checkNameType; } + public void setCheckNameType(String checkNameType) { + this.checkNameType = checkNameType; + } + @JSONField(serialize = false) public CorpPaymentCheckNameType getFormatCheckNameType() { return checkNameType != null ? CorpPaymentCheckNameType @@ -174,10 +210,18 @@ public class CorpPaymentRecord extends MerchantResult { return desc; } + public void setDesc(String desc) { + this.desc = desc; + } + public String getCheckNameResult() { return checkNameResult; } + public void setCheckNameResult(String checkNameResult) { + this.checkNameResult = checkNameResult; + } + /** * 格式化交易状态 * diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentResult.java index 24974702..1843bf55 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentResult.java @@ -43,7 +43,7 @@ public class CorpPaymentResult extends MerchantResult { @XmlElement(name = "payment_time") private String paymentTime; - public CorpPaymentResult() { + protected CorpPaymentResult() { // jaxb required } @@ -51,14 +51,26 @@ public class CorpPaymentResult extends MerchantResult { return transactionId; } + public void setTransactionId(String transactionId) { + this.transactionId = transactionId; + } + public String getOutTradeNo() { return outTradeNo; } + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + public String getPaymentTime() { return paymentTime; } + public void setPaymentTime(String paymentTime) { + this.paymentTime = paymentTime; + } + @JSONField(serialize = false) public Date getFormatPaymentTime() { return paymentTime != null ? DateUtil.parseDate(paymentTime, diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrder.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrder.java index e21da276..90dda051 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrder.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrder.java @@ -1,9 +1,9 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.CredentialType; -import com.foxinmy.weixin4j.type.CurrencyType; -import com.foxinmy.weixin4j.type.CustomsCity; +import com.foxinmy.weixin4j.pay.type.CredentialType; +import com.foxinmy.weixin4j.pay.type.CurrencyType; +import com.foxinmy.weixin4j.pay.type.CustomsCity; import javax.xml.bind.annotation.XmlElement; @@ -40,7 +40,7 @@ public class CustomsOrder extends MerchantResult { /** * 货币类型,符合 ISO 4217 标准的三位字母代码,默认人民币:CNY * - * @see com.foxinmy.weixin4j.mp.type.CurrencyType + * @see com.foxinmy.weixin4j.pay.type.CurrencyType */ @XmlElement(name = "fee_type") @JSONField(name = "fee_type") diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrderResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrderResult.java index ba58c2cf..c26a805a 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrderResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrderResult.java @@ -1,7 +1,7 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.CustomsSatus; +import com.foxinmy.weixin4j.pay.type.CustomsSatus; import com.foxinmy.weixin4j.util.DateUtil; import javax.xml.bind.annotation.XmlElement; diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MICROPayRequest.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MICROPayRequest.java index 4af89e72..8bf5d703 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MICROPayRequest.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MICROPayRequest.java @@ -27,7 +27,7 @@ public class MICROPayRequest extends Order implements MchPayRequest { @JSONField(serialize = false) private WeixinPayAccount paymentAccount; - public MICROPayRequest() { + protected MICROPayRequest() { // jaxb required } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MchPayPackage.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MchPayPackage.java index 2aefc2fd..e081b23c 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MchPayPackage.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MchPayPackage.java @@ -90,7 +90,7 @@ public class MchPayPackage extends PayPackage { @JSONField(name = "deposit") private DepositType deposit; - public MchPayPackage() { + protected MchPayPackage() { // jaxb required } @@ -193,22 +193,42 @@ public class MchPayPackage extends PayPackage { return tradeType; } + public void setTradeType(String tradeType) { + this.tradeType = tradeType; + } + public String getFeeType() { return feeType; } + public void setFeeType(String feeType) { + this.feeType = feeType; + } + public String getOpenId() { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public String getAuthCode() { return authCode; } + public void setAuthCode(String authCode) { + this.authCode = authCode; + } + public String getProductId() { return productId; } + public void setProductId(String productId) { + this.productId = productId; + } + public String getLimitPay() { return limitPay; } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantResult.java index 5aa8a41b..ddebf2e2 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantResult.java @@ -75,7 +75,7 @@ public class MerchantResult extends XmlResult { */ private String recall; - public MerchantResult() { + protected MerchantResult() { // jaxb required } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantTradeResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantTradeResult.java index d257f11b..0ba7b988 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantTradeResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantTradeResult.java @@ -1,7 +1,7 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.CurrencyType; +import com.foxinmy.weixin4j.pay.type.CurrencyType; import javax.xml.bind.annotation.XmlElement; @@ -60,6 +60,10 @@ public class MerchantTradeResult extends MerchantResult { return cashFee; } + public void setCashFee(Integer cashFee) { + this.cashFee = cashFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -74,6 +78,10 @@ public class MerchantTradeResult extends MerchantResult { return totalFee; } + public void setTotalFee(Integer totalFee) { + this.totalFee = totalFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -94,18 +102,34 @@ public class MerchantTradeResult extends MerchantResult { return feeType; } + public void setFeeType(String feeType) { + this.feeType = feeType; + } + public String getTransactionId() { return transactionId; } + public void setTransactionId(String transactionId) { + this.transactionId = transactionId; + } + public String getOutTradeNo() { return outTradeNo; } + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + public Integer getSettlementTotalFee() { return settlementTotalFee; } + public void setSettlementTotalFee(Integer settlementTotalFee) { + this.settlementTotalFee = settlementTotalFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayNotify.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayNotify.java index b195aa4a..b998c737 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayNotify.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayNotify.java @@ -34,7 +34,7 @@ public class NativePayNotify extends OpenIdResult { @JSONField(name = "product_id") private String productId; - public NativePayNotify() { + protected NativePayNotify() { // jaxb required } @@ -42,10 +42,18 @@ public class NativePayNotify extends OpenIdResult { return productId; } + public void setIsSubscribe(String isSubscribe) { + this.isSubscribe = isSubscribe; + } + public String getIsSubscribe() { return isSubscribe; } + public void setProductId(String productId) { + this.productId = productId; + } + @Override public String toString() { return "NativePayNotify [productId=" + productId + ", isSubscribe=" diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayResponse.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayResponse.java index 67f43dad..15996c5b 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayResponse.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayResponse.java @@ -30,7 +30,7 @@ public class NativePayResponse extends MerchantResult { @JSONField(name = "prepay_id") private String prepayId; - public NativePayResponse() { + protected NativePayResponse() { // jaxb required } @@ -71,6 +71,10 @@ public class NativePayResponse extends MerchantResult { return prepayId; } + public void setPrepayId(String prepayId) { + this.prepayId = prepayId; + } + @Override public String toString() { return "NativePayResponse [prepayId=" + prepayId + ", " diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/OpenIdResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/OpenIdResult.java index 3c4cfd95..b3d664c8 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/OpenIdResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/OpenIdResult.java @@ -40,10 +40,18 @@ public class OpenIdResult extends MerchantResult { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public String getSubOpenId() { return subOpenId; } + public void setSubOpenId(String subOpenId) { + this.subOpenId = subOpenId; + } + @Override public String toString() { return "OpenIdResult [openId=" + openId + ", subOpenId=" + subOpenId diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Order.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Order.java index 353c4022..945ef736 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Order.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Order.java @@ -2,10 +2,10 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; import com.foxinmy.weixin4j.pay.payment.coupon.OrderCouponInfo; -import com.foxinmy.weixin4j.type.BankType; -import com.foxinmy.weixin4j.type.CurrencyType; -import com.foxinmy.weixin4j.type.TradeState; -import com.foxinmy.weixin4j.type.TradeType; +import com.foxinmy.weixin4j.pay.type.BankType; +import com.foxinmy.weixin4j.pay.type.CurrencyType; +import com.foxinmy.weixin4j.pay.type.TradeState; +import com.foxinmy.weixin4j.pay.type.TradeType; import com.foxinmy.weixin4j.util.DateUtil; import com.foxinmy.weixin4j.xml.ListsuffixResult; @@ -120,7 +120,7 @@ public class Order extends MerchantTradeResult { @JSONField(name = "sub_is_subscribe") private String subIsSubscribe; - public Order() { + protected Order() { // jaxb required } @@ -134,10 +134,18 @@ public class Order extends MerchantTradeResult { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public String getIsSubscribe() { return isSubscribe; } + public void setIsSubscribe(String isSubscribe) { + this.isSubscribe = isSubscribe; + } + @JSONField(serialize = false) public boolean getFormatIsSubscribe() { return isSubscribe != null && isSubscribe.equalsIgnoreCase("y"); @@ -153,6 +161,10 @@ public class Order extends MerchantTradeResult { return bankType; } + public void setBankType(String bankType) { + this.bankType = bankType; + } + @JSONField(serialize = false) public BankType getFormatBankType() { return bankType != null ? BankType.valueOf(bankType.toUpperCase()) @@ -163,6 +175,10 @@ public class Order extends MerchantTradeResult { return couponFee; } + public void setCouponFee(Integer couponFee) { + this.couponFee = couponFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -177,22 +193,42 @@ public class Order extends MerchantTradeResult { return couponCount; } + public void setCouponCount(Integer couponCount) { + this.couponCount = couponCount; + } + public String getTradeState() { return tradeState; } + public void setTradeState(String tradeState) { + this.tradeState = tradeState; + } + public String getTradeType() { return tradeType; } + public void setTradeType(String tradeType) { + this.tradeType = tradeType; + } + public String getAttach() { return attach; } + public void setAttach(String attach) { + this.attach = attach; + } + public String getTimeEnd() { return timeEnd; } + public void setTimeEnd(String timeEnd) { + this.timeEnd = timeEnd; + } + @JSONField(serialize = false) public Date getFormatTimeEnd() { return timeEnd != null ? DateUtil.parse2yyyyMMddHHmmss(timeEnd) : null; @@ -202,6 +238,10 @@ public class Order extends MerchantTradeResult { return tradeStateDesc; } + public void setTradeStateDesc(String tradeStateDesc) { + this.tradeStateDesc = tradeStateDesc; + } + public List getCouponList() { return couponList; } @@ -214,10 +254,18 @@ public class Order extends MerchantTradeResult { return subOpenId; } + public void setSubOpenId(String subOpenId) { + this.subOpenId = subOpenId; + } + public String getSubIsSubscribe() { return subIsSubscribe; } + public void setSubIsSubscribe(String subIsSubscribe) { + this.subIsSubscribe = subIsSubscribe; + } + @JSONField(serialize = false) public boolean getFormatSubIsSubscribe() { return subIsSubscribe != null && subIsSubscribe.equalsIgnoreCase("y"); @@ -227,6 +275,10 @@ public class Order extends MerchantTradeResult { return cashFeeType; } + public void setCashFeeType(String cashFeeType) { + this.cashFeeType = cashFeeType; + } + @JSONField(serialize = false) public CurrencyType getFormatCashFeeType() { return cashFeeType != null ? CurrencyType.valueOf(cashFeeType diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/PrePay.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/PrePay.java index 0741e80a..acd557e2 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/PrePay.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/PrePay.java @@ -1,6 +1,6 @@ package com.foxinmy.weixin4j.pay.payment.mch; -import com.foxinmy.weixin4j.type.TradeType; +import com.foxinmy.weixin4j.pay.type.TradeType; import javax.xml.bind.annotation.*; @@ -22,7 +22,7 @@ public class PrePay extends MerchantResult { /** * 调用接口提交的交易类型，取值如下：JSAPI，NATIVE，APP， * - * @see com.foxinmy.weixin4j.mp.type.TradeType + * @see com.foxinmy.weixin4j.pay.type.TradeType */ @XmlElement(name = "trade_type") private TradeType tradeType; @@ -39,7 +39,7 @@ public class PrePay extends MerchantResult { @XmlElement(name = "mweb_url") }) private String payUrl; - public PrePay() { + protected PrePay() { // jaxb required } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Redpacket.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Redpacket.java index e5cd8997..d10b4d2f 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Redpacket.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Redpacket.java @@ -1,7 +1,7 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.mch.RedpacketSceneType; +import com.foxinmy.weixin4j.pay.type.mch.RedpacketSceneType; import com.foxinmy.weixin4j.util.DateUtil; import javax.xml.bind.annotation.XmlAccessType; @@ -110,7 +110,7 @@ public class Redpacket extends MerchantResult { @JSONField(name = "risk_info") private String risk; - public Redpacket() { + protected Redpacket() { // jaxb required } @@ -174,18 +174,34 @@ public class Redpacket extends MerchantResult { return outTradeNo; } + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + public String getOpenId() { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public String getSendName() { return sendName; } + public void setSendName(String sendName) { + this.sendName = sendName; + } + public int getTotalAmount() { return totalAmount; } + public void setTotalAmount(int totalAmount) { + this.totalAmount = totalAmount; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -200,26 +216,50 @@ public class Redpacket extends MerchantResult { return totalNum; } + public void setTotalNum(int totalNum) { + this.totalNum = totalNum; + } + public String getWishing() { return wishing; } + public void setWishing(String wishing) { + this.wishing = wishing; + } + public String getAmtType() { return amtType; } + public void setAmtType(String amtType) { + this.amtType = amtType; + } + public String getClientIp() { return clientIp; } + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } + public String getActName() { return actName; } + public void setActName(String actName) { + this.actName = actName; + } + public String getRemark() { return remark; } + public void setRemark(String remark) { + this.remark = remark; + } + public String getMsgAppId() { return msgAppId; } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRecord.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRecord.java index 2cee591b..00bda846 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRecord.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRecord.java @@ -2,9 +2,9 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; import com.foxinmy.weixin4j.http.weixin.XmlResult; -import com.foxinmy.weixin4j.type.mch.RedpacketSendType; -import com.foxinmy.weixin4j.type.mch.RedpacketStatus; -import com.foxinmy.weixin4j.type.mch.RedpacketType; +import com.foxinmy.weixin4j.pay.type.mch.RedpacketSendType; +import com.foxinmy.weixin4j.pay.type.mch.RedpacketStatus; +import com.foxinmy.weixin4j.pay.type.mch.RedpacketType; import com.foxinmy.weixin4j.util.DateUtil; import javax.xml.bind.annotation.*; diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRisk.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRisk.java index 05127d0b..0451a36d 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRisk.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRisk.java @@ -72,6 +72,10 @@ public class RedpacketRisk { return risk; } + public void setRisk(Map risk) { + this.risk = risk; + } + public String toContent() { if (risk.isEmpty()) return null; diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketSendResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketSendResult.java index c7a0f625..d2f63fd0 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketSendResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketSendResult.java @@ -54,7 +54,7 @@ public class RedpacketSendResult extends MerchantResult { @JSONField(name = "send_listid") private String sendListid; - public RedpacketSendResult() { + protected RedpacketSendResult() { // jaxb required } @@ -62,14 +62,26 @@ public class RedpacketSendResult extends MerchantResult { return outTradeNo; } + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + public String getOpenId() { return openId; } + public void setOpenId(String openId) { + this.openId = openId; + } + public int getTotalAmount() { return totalAmount; } + public void setTotalAmount(int totalAmount) { + this.totalAmount = totalAmount; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -84,6 +96,10 @@ public class RedpacketSendResult extends MerchantResult { return sendTime; } + public void setSendTime(String sendTime) { + this.sendTime = sendTime; + } + @JSONField(serialize = false) public Date getFormatSendTime() { return DateUtil.parse2yyyyMMddHHmmss(sendTime); @@ -93,6 +109,10 @@ public class RedpacketSendResult extends MerchantResult { return sendListid; } + public void setSendListid(String sendListid) { + this.sendListid = sendListid; + } + @Override public String toString() { return "RedpacketSendResult [outTradeNo=" + outTradeNo + ", openId=" diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundDetail.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundDetail.java index 3bea6fb0..65190bc2 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundDetail.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundDetail.java @@ -2,9 +2,9 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; import com.foxinmy.weixin4j.pay.payment.coupon.RefundCouponInfo; -import com.foxinmy.weixin4j.type.mch.CouponType; -import com.foxinmy.weixin4j.type.mch.RefundChannel; -import com.foxinmy.weixin4j.type.mch.RefundStatus; +import com.foxinmy.weixin4j.pay.type.mch.CouponType; +import com.foxinmy.weixin4j.pay.type.mch.RefundChannel; +import com.foxinmy.weixin4j.pay.type.mch.RefundStatus; import com.foxinmy.weixin4j.util.DateUtil; import com.foxinmy.weixin4j.xml.ListsuffixResult; @@ -29,7 +29,7 @@ import java.util.List; public class RefundDetail implements Serializable { private static final long serialVersionUID = 1402738803019986864L; - public RefundDetail() { + protected RefundDetail() { // jaxb required } @@ -113,14 +113,26 @@ public class RefundDetail implements Serializable { return outRefundNo; } + public void setOutRefundNo(String outRefundNo) { + this.outRefundNo = outRefundNo; + } + public String getRefundId() { return refundId; } + public void setRefundId(String refundId) { + this.refundId = refundId; + } + public String getRefundChannel() { return refundChannel; } + public void setRefundChannel(String refundChannel) { + this.refundChannel = refundChannel; + } + @JSONField(serialize = false) public RefundChannel getFormatRefundChannel() { return refundChannel != null ? RefundChannel.valueOf(refundChannel @@ -131,10 +143,18 @@ public class RefundDetail implements Serializable { return refundFee; } + public void setRefundFee(int refundFee) { + this.refundFee = refundFee; + } + public String getRefundStatus() { return refundStatus; } + public void setRefundStatus(String refundStatus) { + this.refundStatus = refundStatus; + } + @JSONField(serialize = false) public RefundStatus getFormatRefundStatus() { return refundStatus != null ? RefundStatus.valueOf(refundStatus @@ -153,6 +173,10 @@ public class RefundDetail implements Serializable { return settlementRefundFee; } + public void setSettlementRefundFee(Integer settlementRefundFee) { + this.settlementRefundFee = settlementRefundFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -167,6 +191,10 @@ public class RefundDetail implements Serializable { return couponRefundFee; } + public void setCouponRefundFee(Integer couponRefundFee) { + this.couponRefundFee = couponRefundFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -181,10 +209,18 @@ public class RefundDetail implements Serializable { return couponRefundCount; } + public void setCouponRefundCount(Integer couponRefundCount) { + this.couponRefundCount = couponRefundCount; + } + public String getCouponType() { return couponType; } + public void setCouponType(String couponType) { + this.couponType = couponType; + } + @JSONField(serialize = false) public CouponType getFormatCouponType() { return couponType != null ? CouponType @@ -195,9 +231,17 @@ public class RefundDetail implements Serializable { return refundRecvAccout; } + public void setRefundRecvAccout(String refundRecvAccout) { + this.refundRecvAccout = refundRecvAccout; + } + public String getRefundSuccessTime() { return refundSuccessTime; } + + public void setRefundSuccessTime(String refundSuccessTime) { + this.refundSuccessTime = refundSuccessTime; + } @JSONField(serialize = false) public Date getFormatRefundSuccessTime() { diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundRecord.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundRecord.java index 012cad78..fbed34d0 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundRecord.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundRecord.java @@ -42,7 +42,7 @@ public class RefundRecord extends MerchantTradeResult { @ListsuffixResult({ ".*(_\\d)$" }) private List refundList; - public RefundRecord() { + protected RefundRecord() { // jaxb required } @@ -50,10 +50,18 @@ public class RefundRecord extends MerchantTradeResult { return refundCount; } + public void setRefundCount(int refundCount) { + this.refundCount = refundCount; + } + public int getRefundFee() { return refundFee; } + public void setRefundFee(int refundFee) { + this.refundFee = refundFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundResult.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundResult.java index 419dbc7c..87f9c06e 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundResult.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundResult.java @@ -1,7 +1,7 @@ package com.foxinmy.weixin4j.pay.payment.mch; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.type.mch.RefundChannel; +import com.foxinmy.weixin4j.pay.type.mch.RefundChannel; import com.foxinmy.weixin4j.xml.ListsuffixResult; import javax.xml.bind.annotation.XmlAccessType; @@ -63,7 +63,7 @@ public class RefundResult extends MerchantTradeResult { @ListsuffixResult({ ".*(_\\d)$" }) private List refundList; - public RefundResult() { + protected RefundResult() { // jaxb required } @@ -71,14 +71,26 @@ public class RefundResult extends MerchantTradeResult { return outRefundNo; } + public void setOutRefundNo(String outRefundNo) { + this.outRefundNo = outRefundNo; + } + public String getRefundId() { return refundId; } + public void setRefundId(String refundId) { + this.refundId = refundId; + } + public String getRefundChannel() { return refundChannel; } + public void setRefundChannel(String refundChannel) { + this.refundChannel = refundChannel; + } + @JSONField(serialize = false) public RefundChannel getFormatRefundChannel() { return refundChannel != null ? RefundChannel.valueOf(refundChannel @@ -89,6 +101,10 @@ public class RefundResult extends MerchantTradeResult { return refundFee; } + public void setRefundFee(int refundFee) { + this.refundFee = refundFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -103,6 +119,10 @@ public class RefundResult extends MerchantTradeResult { return cashRefundFee; } + public void setCashRefundFee(Integer cashRefundFee) { + this.cashRefundFee = cashRefundFee; + } + /** * 调用接口获取单位为分,get方法转换为元方便使用 * @@ -117,6 +137,10 @@ public class RefundResult extends MerchantTradeResult { return refundList; } + public void setRefundList(List refundList) { + this.refundList = refundList; + } + @Override public String toString() { return "RefundResult [" + super.toString() + ", outRefundNo=" diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SceneInfoApp.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SceneInfoApp.java index 48a5b763..7c708e5f 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SceneInfoApp.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SceneInfoApp.java @@ -21,6 +21,10 @@ public class SceneInfoApp { private String path; private String sceneInfo; + protected SceneInfoApp(){ + + } + private SceneInfoApp(String type, String name, String path) { this.type = type; this.name = name; @@ -31,14 +35,26 @@ public class SceneInfoApp { return type; } + public void setType(String type) { + this.type = type; + } + public String getName() { return name; } + public void setName(String name) { + this.name = name; + } + public String getPath() { return path; } + public void setPath(String path) { + this.path = path; + } + public String getSceneInfo() { return sceneInfo; } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SettlementRecord.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SettlementRecord.java index 509a214c..501abd03 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SettlementRecord.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SettlementRecord.java @@ -87,7 +87,7 @@ public class SettlementRecord extends MerchantResult { @JSONField(name = "poundage_fee") private int poundageFee; - public SettlementRecord() { + protected SettlementRecord() { // jaxb required } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/type/TradeState.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/type/TradeState.java index 14a30e3c..2b302adc 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/type/TradeState.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/type/TradeState.java @@ -8,7 +8,6 @@ package com.foxinmy.weixin4j.pay.type; * @date 2014年11月2日 * @since JDK 1.6 * @see - * @deprecated 迁移到子模块weixin4j-pay */ public enum TradeState { /**