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

Merge pull request #198 from kit-lee/fix_json_parse_problem

Browse Source 
Fix json parse problem
This commit is contained in:
jinyu 2020-04-02 11:03:16 +08:00 committed by GitHub
commit 91d880eb7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 602 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/XmlResult.java
View File

@ -68,6 +68,10 @@ public class XmlResult implements Serializable {
return resultCode;
}
public void setReturnCode(String returnCode) {
this.returnCode = returnCode;
}
public String getErrCode() {
return errCode;
}
@ -84,6 +88,10 @@ public class XmlResult implements Serializable {
return returnMsg;
}
public void setReturnMsg(String returnMsg) {
this.returnMsg = returnMsg;
}
public void setResultCode(String resultCode) {
this.resultCode = resultCode;
}

1
weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/CorpPaymentCheckNameType.java
View File

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

2
weixin4j-pay/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<name>weixin4j-pay</name>
<artifactId>weixin4j-pay</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-pay</url>
<description>微信支付商户平台API</description>
<developers>

8
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/JsPayNotify.java
View File

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

4
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/PayPackage.java
View File

@ -194,6 +194,10 @@ public class PayPackage extends MerchantResult {
public int getTotalFee() {
return totalFee;
}
public void setTotalFee(int totalFee) {
this.totalFee = totalFee;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>

84
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponDetail.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -214,6 +230,10 @@ public class CouponDetail extends MerchantResult {
return couponMininum;
}
public void setCouponMininum(int couponMininum) {
this.couponMininum = couponMininum;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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

32
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponResult.java
View File

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

60
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/CouponStock.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -148,6 +160,10 @@ public class CouponStock extends MerchantResult {
return couponMininumn;
}
public void setCouponMininumn(Integer couponMininumn) {
this.couponMininumn = couponMininumn;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -208,6 +240,10 @@ public class CouponStock extends MerchantResult {
return lockedNum;
}
public void setLockedNum(Integer lockedNum) {
this.lockedNum = lockedNum;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -222,6 +258,10 @@ public class CouponStock extends MerchantResult {
return usedNum;
}
public void setUsedNum(Integer usedNum) {
this.usedNum = usedNum;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -236,6 +276,10 @@ public class CouponStock extends MerchantResult {
return sendNum;
}
public void setSendNum(Integer sendNum) {
this.sendNum = sendNum;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*

16
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/OrderCouponInfo.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*

12
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/coupon/RefundCouponInfo.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*

32
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPayment.java
View File

@ -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")
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
@ -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

48
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentRecord.java
View File

@ -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")
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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;
}
/**
* 格式化交易状态
*

12
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CorpPaymentResult.java
View File

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

8
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrder.java
View File

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

2
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/CustomsOrderResult.java
View File

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

20
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MchPayPackage.java
View File

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

26
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/MerchantTradeResult.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -74,6 +78,10 @@ public class MerchantTradeResult extends MerchantResult {
return totalFee;
}
public void setTotalFee(Integer totalFee) {
this.totalFee = totalFee;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*

8
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayNotify.java
View File

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

4
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/NativePayResponse.java
View File

@ -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 + ", "

8
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/OpenIdResult.java
View File

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

60
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Order.java
View File

@ -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;
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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<OrderCouponInfo> 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

4
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/PrePay.java
View File

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

40
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/Redpacket.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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;
}

6
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRecord.java
View File

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

4
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketRisk.java
View File

@ -72,6 +72,10 @@ public class RedpacketRisk {
return risk;
}
public void setRisk(Map<String, String> risk) {
this.risk = risk;
}
public String toContent() {
if (risk.isEmpty())
return null;

20
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RedpacketSendResult.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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="

50
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundDetail.java
View File

@ -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;
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -167,6 +191,10 @@ public class RefundDetail implements Serializable {
return couponRefundFee;
}
public void setCouponRefundFee(Integer couponRefundFee) {
this.couponRefundFee = couponRefundFee;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -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() {

8
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundRecord.java
View File

@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*

26
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/RefundResult.java
View File

@ -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;
@ -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;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -103,6 +119,10 @@ public class RefundResult extends MerchantTradeResult {
return cashRefundFee;
}
public void setCashRefundFee(Integer cashRefundFee) {
this.cashRefundFee = cashRefundFee;
}
/**
* <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
*
@ -117,6 +137,10 @@ public class RefundResult extends MerchantTradeResult {
return refundList;
}
public void setRefundList(List<RefundDetail> refundList) {
this.refundList = refundList;
}
@Override
public String toString() {
return "RefundResult [" + super.toString() + ", outRefundNo="

16
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/payment/mch/SceneInfoApp.java
View File

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

1
weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/type/TradeState.java
View File

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