>() {
}.getType());
}
-
+
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
index 908dfca8..01e40e80 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
@@ -10,7 +10,7 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 消息分析数据接口返回结果对象
- * @author binarywang(https://github.com/binarywang)
+ * @author binarywang(Binary Wang)
* Created by Binary Wang on 2016/8/29.
*/
public class WxDataCubeMsgResult extends WxDataCubeBaseResult {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxEntPayRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxEntPayRequest.java
new file mode 100644
index 00000000..38ed704a
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxEntPayRequest.java
@@ -0,0 +1,284 @@
+package me.chanjar.weixin.mp.bean.pay;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ *
+ * 企业付款请求对象
+ * 注释中各行每个字段描述对应如下:
+ *
字段名
+ * 变量名
+ * 是否必填
+ * 类型
+ * 示例值
+ * 描述
+ *
+ * Created by Binary Wang on 2016/10/02.
+ * @author binarywang (https://github.com/binarywang)
+ */
+@XStreamAlias("xml")
+public class WxEntPayRequest {
+ /**
+ *
+ * 公众账号appid
+ * mch_appid
+ * 是
+ * wx8888888888888888
+ * String
+ * 微信分配的公众账号ID(企业号corpid即为此appId)
+ *
+ */
+ @XStreamAlias("mch_appid")
+ private String mchAppid;
+
+ /**
+ *
+ * 商户号
+ * mchid
+ * 是
+ * 1900000109
+ * String(32)
+ * 微信支付分配的商户号
+ *
+ */
+ @XStreamAlias("mchid")
+ private String mchId;
+
+ /**
+ *
+ * 设备号
+ * device_info
+ * 否
+ * 13467007045764
+ * String(32)
+ *微信支付分配的终端设备号
+ *
+ */
+ @XStreamAlias("device_info")
+ private String deviceInfo;
+
+ /**
+ *
+ * 随机字符串
+ * nonce_str
+ *是
+ *5K8264ILTKCH16CQ2502SI8ZNMTM67VS
+ *String(32)
+ *随机字符串,不长于32位
+ *
+ */
+ @XStreamAlias("nonce_str")
+ private String nonceStr;
+
+ /**
+ *
+ * 签名
+ * sign
+ * 是
+ * C380BEC2BFD727A4B6845133519F3AD6
+ * String(32)
+ *签名,详见签名算法
+ *
+ */
+ @XStreamAlias("sign")
+ private String sign;
+
+ /**
+ *
+ * 商户订单号
+ * partner_trade_no
+ * 是
+ * 10000098201411111234567890
+ * String
+ * 商户订单号
+ *
+ */
+ @XStreamAlias("partner_trade_no")
+ private String partnerTradeNo;
+
+ /**
+ *
+ * 需保持唯一性 用户openid
+ * openid
+ * 是
+ * oxTWIuGaIt6gTKsQRLau2M0yL16E
+ * String
+ * 商户appid下,某用户的openid
+ *
+ */
+ @XStreamAlias("openid")
+ private String openid;
+
+ /**
+ *
+ * 校验用户姓名选项
+ * check_name
+ * 是
+ * OPTION_CHECK
+ * String
+ * NO_CHECK:不校验真实姓名
+ * FORCE_CHECK:强校验真实姓名(未实名认证的用户会校验失败,无法转账)
+ * OPTION_CHECK:针对已实名认证的用户才校验真实姓名(未实名认证用户不校验,可以转账成功)
+ *
+ */
+ @XStreamAlias("check_name")
+ private String checkName;
+
+ /**
+ *
+ * 收款用户姓名
+ * re_user_name
+ * 可选
+ * 马花花
+ * String
+ * 收款用户真实姓名。
+ * 如果check_name设置为FORCE_CHECK或OPTION_CHECK, 则必填用户真实姓名
+ *
+ */
+ @XStreamAlias("re_user_name")
+ private String reUserName;
+
+ /**
+ *
+ * 金额
+ * amount
+ * 是
+ * 10099
+ * int
+ * 企业付款金额, 单位为分
+ *
+ */
+ @XStreamAlias("amount")
+ private Integer amount;
+
+ /**
+ *
+ * 企业付款描述信息
+ * desc
+ * 是
+ * 理赔
+ * String
+ * 企业付款操作说明信息。必填。
+ *
+ */
+ @XStreamAlias("desc")
+ private String description;
+
+ /**
+ *
+ * Ip地址
+ * spbill_create_ip
+ * 是
+ * 192.168.0.1
+ * String(32)
+ * 调用接口的机器Ip地址
+ *
+ */
+ @XStreamAlias("spbill_create_ip")
+ private String spbillCreateIp;
+
+ public String getMchAppid() {
+ return mchAppid;
+ }
+
+ public void setMchAppid(String mchAppid) {
+ this.mchAppid = mchAppid;
+ }
+
+ public String getMchId() {
+ return mchId;
+ }
+
+ public void setMchId(String mchId) {
+ this.mchId = mchId;
+ }
+
+ public String getDeviceInfo() {
+ return deviceInfo;
+ }
+
+ public void setDeviceInfo(String deviceInfo) {
+ this.deviceInfo = deviceInfo;
+ }
+
+ public String getNonceStr() {
+ return nonceStr;
+ }
+
+ public void setNonceStr(String nonceStr) {
+ this.nonceStr = nonceStr;
+ }
+
+ public String getSign() {
+ return sign;
+ }
+
+ public void setSign(String sign) {
+ this.sign = sign;
+ }
+
+ public String getPartnerTradeNo() {
+ return partnerTradeNo;
+ }
+
+ public void setPartnerTradeNo(String partnerTradeNo) {
+ this.partnerTradeNo = partnerTradeNo;
+ }
+
+ public String getOpenid() {
+ return openid;
+ }
+
+ public void setOpenid(String openid) {
+ this.openid = openid;
+ }
+
+ public String getCheckName() {
+ return checkName;
+ }
+
+ public void setCheckName(String checkName) {
+ this.checkName = checkName;
+ }
+
+ public String getReUserName() {
+ return reUserName;
+ }
+
+ public void setReUserName(String reUserName) {
+ this.reUserName = reUserName;
+ }
+
+ public Integer getAmount() {
+ return amount;
+ }
+
+ public void setAmount(Integer amount) {
+ this.amount = amount;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getSpbillCreateIp() {
+ return spbillCreateIp;
+ }
+
+ public void setSpbillCreateIp(String spbillCreateIp) {
+ this.spbillCreateIp = spbillCreateIp;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+ }
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxEntPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxEntPayResult.java
new file mode 100644
index 00000000..b2dbb8f1
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxEntPayResult.java
@@ -0,0 +1,190 @@
+package me.chanjar.weixin.mp.bean.pay;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ * 企业付款返回结果
+ * Created by Binary Wang on 2016/10/02.
+ * @author binarywang (https://github.com/binarywang)
+ */
+@XStreamAlias("xml")
+public class WxEntPayResult {
+
+ /**
+ * 返回状态码
+ */
+ @XStreamAlias("return_code")
+ private String returnCode;
+
+ /**
+ * 返回信息
+ */
+ @XStreamAlias("return_msg")
+ private String returnMsg;
+
+ //############以下字段在return_code为SUCCESS的时候有返回
+
+ /**
+ * 商户appid
+ */
+ @XStreamAlias("mch_appid")
+ private String mchAppid;
+
+ /**
+ * 商户号
+ */
+ @XStreamAlias("mchid")
+ private String mchId;
+
+ /**
+ * 设备号
+ */
+ @XStreamAlias("device_info")
+ private String deviceInfo;
+
+ /**
+ * 随机字符串
+ */
+ @XStreamAlias("nonce_str")
+ private String nonceStr;
+
+ /**
+ * 业务结果
+ */
+ @XStreamAlias("result_code")
+ private String resultCode;
+ /**
+ * 错误代码
+ */
+ @XStreamAlias("err_code")
+ private String errCode;
+
+ /**
+ * 错误代码描述
+ */
+ @XStreamAlias("err_code_des")
+ private String errCodeDes;
+
+ //############以下字段在return_code 和result_code都为SUCCESS的时候有返回##############
+ /**
+ * 商户订单号
+ */
+ @XStreamAlias("partner_trade_no")
+ private String partnerTradeNo;
+
+ /**
+ * 微信订单号
+ */
+ @XStreamAlias("payment_no")
+ private String paymentNo;
+
+ /**
+ * 微信支付成功时间
+ */
+ @XStreamAlias("payment_time")
+ private String paymentTime;
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+ }
+
+ public String getReturnCode() {
+ return returnCode;
+ }
+
+ public void setReturnCode(String returnCode) {
+ this.returnCode = returnCode;
+ }
+
+ public String getReturnMsg() {
+ return returnMsg;
+ }
+
+ public void setReturnMsg(String returnMsg) {
+ this.returnMsg = returnMsg;
+ }
+
+ public String getMchAppid() {
+ return mchAppid;
+ }
+
+ public void setMchAppid(String mchAppid) {
+ this.mchAppid = mchAppid;
+ }
+
+ public String getMchId() {
+ return mchId;
+ }
+
+ public void setMchId(String mchId) {
+ this.mchId = mchId;
+ }
+
+ public String getDeviceInfo() {
+ return deviceInfo;
+ }
+
+ public void setDeviceInfo(String deviceInfo) {
+ this.deviceInfo = deviceInfo;
+ }
+
+ public String getNonceStr() {
+ return nonceStr;
+ }
+
+ public void setNonceStr(String nonceStr) {
+ this.nonceStr = nonceStr;
+ }
+
+ public String getResultCode() {
+ return resultCode;
+ }
+
+ public void setResultCode(String resultCode) {
+ this.resultCode = resultCode;
+ }
+
+ public String getErrCode() {
+ return errCode;
+ }
+
+ public void setErrCode(String errCode) {
+ this.errCode = errCode;
+ }
+
+ public String getErrCodeDes() {
+ return errCodeDes;
+ }
+
+ public void setErrCodeDes(String errCodeDes) {
+ this.errCodeDes = errCodeDes;
+ }
+
+ public String getPartnerTradeNo() {
+ return partnerTradeNo;
+ }
+
+ public void setPartnerTradeNo(String partnerTradeNo) {
+ this.partnerTradeNo = partnerTradeNo;
+ }
+
+ public String getPaymentNo() {
+ return paymentNo;
+ }
+
+ public void setPaymentNo(String paymentNo) {
+ this.paymentNo = paymentNo;
+ }
+
+ public String getPaymentTime() {
+ return paymentTime;
+ }
+
+ public void setPaymentTime(String paymentTime) {
+ this.paymentTime = paymentTime;
+ }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundRequest.java
new file mode 100644
index 00000000..26f837b4
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundRequest.java
@@ -0,0 +1,301 @@
+package me.chanjar.weixin.mp.bean.pay;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.annotation.Required;
+
+/**
+ *
+ * 微信支付-申请退款请求参数
+ * 注释中各行每个字段描述对应如下:
+ *
字段名
+ * 变量名
+ * 是否必填
+ * 类型
+ * 示例值
+ * 描述
+ *
+ *
+ * @author binarywang(Binary Wang)
+ * Created by Binary Wang on 2016-10-08.
+ */
+@XStreamAlias("xml")
+public class WxMpPayRefundRequest {
+ /**
+ *
+ * 公众账号ID
+ * appid
+ * 是
+ * String(32)
+ * wx8888888888888888
+ * 微信分配的公众账号ID(企业号corpid即为此appId)
+ *
+ */
+ @XStreamAlias("appid")
+ private String appid;
+
+ /**
+ *
+ * 商户号
+ * mch_id
+ * 是
+ * String(32)
+ * 1900000109
+ * 微信支付分配的商户号
+ *
+ */
+ @XStreamAlias("mch_id")
+ private String mchId;
+
+ /**
+ *
+ * 设备号
+ * device_info
+ * 否
+ * String(32)
+ * 13467007045764
+ * 终端设备号
+ *
+ */
+ @XStreamAlias("device_info")
+ private String deviceInfo;
+
+ /**
+ *
+ * 随机字符串
+ * nonce_str
+ * 是
+ * String(32)
+ * 5K8264ILTKCH16CQ2502SI8ZNMTM67VS
+ * 随机字符串,不长于32位。推荐随机数生成算法
+ *
+ */
+ @XStreamAlias("nonce_str")
+ private String nonceStr;
+
+ /**
+ *
+ * 签名
+ * sign
+ * 是
+ * String(32)
+ * C380BEC2BFD727A4B6845133519F3AD6
+ * 签名,详见签名生成算法
+ *
+ */
+ @XStreamAlias("sign")
+ private String sign;
+
+ /**
+ *
+ * 微信订单号
+ * transaction_id
+ * 跟out_trade_no二选一
+ * String(28)
+ * 1217752501201400000000000000
+ * 微信生成的订单号,在支付通知中有返回
+ *
+ */
+ @XStreamAlias("transaction_id")
+ private String transactionId;
+
+ /**
+ *
+ * 商户订单号
+ * out_trade_no
+ * 跟transaction_id二选一
+ * String(32)
+ * 1217752501201400000000000000
+ * 商户侧传给微信的订单号
+ *
+ */
+ @XStreamAlias("out_trade_no")
+ private String outTradeNo;
+
+ /**
+ *
+ * 商户退款单号
+ * out_refund_no
+ * 是
+ * String(32)
+ * 1217752501201400000000000000
+ * 商户系统内部的退款单号,商户系统内部唯一,同一退款单号多次请求只退一笔
+ *
+ */
+ @Required
+ @XStreamAlias("out_refund_no")
+ private String outRefundNo;
+
+ /**
+ *
+ * 订单金额
+ * total_fee
+ * 是
+ * Int
+ * 100
+ * 订单总金额,单位为分,只能为整数,详见支付金额
+ *
+ */
+ @Required
+ @XStreamAlias("total_fee")
+ private Integer totalFee;
+
+ /**
+ *
+ * 退款金额
+ * refund_fee
+ * 是
+ * Int
+ * 100
+ * 退款总金额,订单总金额,单位为分,只能为整数,详见支付金额
+ *
+ */
+ @Required
+ @XStreamAlias("refund_fee")
+ private Integer refundFee;
+
+ /**
+ *
+ * 货币种类
+ * refund_fee_type
+ * 否
+ * String(8)
+ * CNY
+ * 货币类型,符合ISO 4217标准的三位字母代码,默认人民币:CNY,其他值列表详见货币类型
+ *
+ */
+ @XStreamAlias("refund_fee_type")
+ private String refundFeeType;
+
+ /**
+ *
+ * 操作员
+ * op_user_id
+ * 是
+ * String(32)
+ * 1900000109
+ * 操作员帐号, 默认为商户号
+ *
+ */
+ //@Required
+ @XStreamAlias("op_user_id")
+ private String opUserId;
+
+ /**
+ *
+ * 退款资金来源
+ * refund_account
+ * 否
+ * String(30)
+ * REFUND_SOURCE_RECHARGE_FUNDS
+ * 仅针对老资金流商户使用,
+ *
REFUND_SOURCE_UNSETTLED_FUNDS---未结算资金退款(默认使用未结算资金退款),
+ * REFUND_SOURCE_RECHARGE_FUNDS---可用余额退款
+ *
+ */
+ @XStreamAlias("refund_account")
+ private String refundAccount;
+
+ public String getAppid() {
+ return appid;
+ }
+
+ public void setAppid(String appid) {
+ this.appid = appid;
+ }
+
+ public String getMchId() {
+ return mchId;
+ }
+
+ public void setMchId(String mchId) {
+ this.mchId = mchId;
+ }
+
+ public String getDeviceInfo() {
+ return deviceInfo;
+ }
+
+ public void setDeviceInfo(String deviceInfo) {
+ this.deviceInfo = deviceInfo;
+ }
+
+ public String getNonceStr() {
+ return nonceStr;
+ }
+
+ public void setNonceStr(String nonceStr) {
+ this.nonceStr = nonceStr;
+ }
+
+ public String getSign() {
+ return sign;
+ }
+
+ public void setSign(String sign) {
+ this.sign = sign;
+ }
+
+ 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 String getOutRefundNo() {
+ return outRefundNo;
+ }
+
+ public void setOutRefundNo(String outRefundNo) {
+ this.outRefundNo = outRefundNo;
+ }
+
+ public Integer getTotalFee() {
+ return totalFee;
+ }
+
+ public void setTotalFee(Integer totalFee) {
+ this.totalFee = totalFee;
+ }
+
+ public Integer getRefundFee() {
+ return refundFee;
+ }
+
+ public void setRefundFee(Integer refundFee) {
+ this.refundFee = refundFee;
+ }
+
+ public String getRefundFeeType() {
+ return refundFeeType;
+ }
+
+ public void setRefundFeeType(String refundFeeType) {
+ this.refundFeeType = refundFeeType;
+ }
+
+ public String getOpUserId() {
+ return opUserId;
+ }
+
+ public void setOpUserId(String opUserId) {
+ this.opUserId = opUserId;
+ }
+
+ public String getRefundAccount() {
+ return refundAccount;
+ }
+
+ public void setRefundAccount(String refundAccount) {
+ this.refundAccount = refundAccount;
+ }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java
index 3f917fe0..7e5d322d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java
@@ -1,278 +1,279 @@
package me.chanjar.weixin.mp.bean.pay;
-import java.io.Serializable;
-
import com.thoughtworks.xstream.annotations.XStreamAlias;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.io.Serializable;
/**
+ *
* 微信支付-申请退款返回结果
* https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4
+ *
* @author liukaitj
*
*/
@XStreamAlias("xml")
public class WxMpPayRefundResult implements Serializable {
-
private static final long serialVersionUID = 1L;
@XStreamAlias("return_code")
private String returnCode;
-
+
@XStreamAlias("return_msg")
private String returnMsg;
-
+
@XStreamAlias("result_code")
private String resultCode;
-
+
@XStreamAlias("err_code")
private String errCode;
-
+
@XStreamAlias("err_code_des")
private String errCodeDes;
-
+
@XStreamAlias("appid")
private String appid;
-
+
@XStreamAlias("mch_id")
private String mchId;
-
+
@XStreamAlias("device_info")
private String deviceInfo;
-
+
@XStreamAlias("nonce_str")
private String nonceStr;
-
+
@XStreamAlias("sign")
private String sign;
-
+
@XStreamAlias("transaction_id")
private String transactionId;
-
+
@XStreamAlias("out_trade_no")
private String outTradeNo;
-
+
@XStreamAlias("out_refund_no")
private String outRefundNo;
-
+
@XStreamAlias("refund_id")
private String refundId;
-
+
@XStreamAlias("refund_channel")
private String refundChannel;
-
+
@XStreamAlias("refund_fee")
private String refundFee;
-
+
@XStreamAlias("total_fee")
private String totalFee;
-
+
@XStreamAlias("fee_type")
private String feeType;
-
+
@XStreamAlias("cash_fee")
private String cashFee;
-
+
@XStreamAlias("cash_refund_fee")
- private String cashRefundfee;
-
+ private String cashRefundFee;
+
@XStreamAlias("coupon_refund_fee")
private String couponRefundFee;
-
+
@XStreamAlias("coupon_refund_count")
private String couponRefundCount;
-
+
@XStreamAlias("coupon_refund_id")
private String couponRefundId;
public String getReturnCode() {
return this.returnCode;
}
-
+
public void setReturnCode(String returnCode) {
this.returnCode = returnCode;
}
-
+
public String getReturnMsg() {
return this.returnMsg;
}
-
+
public void setReturnMsg(String returnMsg) {
this.returnMsg = returnMsg;
}
-
+
public String getResultCode() {
return this.resultCode;
}
-
+
public void setResultCode(String resultCode) {
this.resultCode = resultCode;
}
-
+
public String getErrCode() {
return this.errCode;
}
-
+
public void setErrCode(String errCode) {
this.errCode = errCode;
}
-
+
public String getErrCodeDes() {
return this.errCodeDes;
}
-
+
public void setErrCodeDes(String errCodeDes) {
this.errCodeDes = errCodeDes;
}
-
+
public String getAppid() {
return this.appid;
}
-
+
public void setAppid(String appid) {
this.appid = appid;
}
-
+
public String getMchId() {
return this.mchId;
}
-
+
public void setMchId(String mchId) {
this.mchId = mchId;
}
-
+
public String getDeviceInfo() {
return this.deviceInfo;
}
-
+
public void setDeviceInfo(String deviceInfo) {
this.deviceInfo = deviceInfo;
}
-
+
public String getNonceStr() {
return this.nonceStr;
}
-
+
public void setNonceStr(String nonceStr) {
this.nonceStr = nonceStr;
}
-
+
public String getSign() {
return this.sign;
}
-
+
public void setSign(String sign) {
this.sign = sign;
}
-
+
public String getTransactionId() {
return this.transactionId;
}
-
+
public void setTransactionId(String transactionId) {
this.transactionId = transactionId;
}
-
+
public String getOutTradeNo() {
return this.outTradeNo;
}
-
+
public void setOutTradeNo(String outTradeNo) {
this.outTradeNo = outTradeNo;
}
-
+
public String getOutRefundNo() {
return this.outRefundNo;
}
-
+
public void setOutRefundNo(String outRefundNo) {
this.outRefundNo = outRefundNo;
}
-
+
public String getRefundId() {
return this.refundId;
}
-
+
public void setRefundId(String refundId) {
this.refundId = refundId;
}
-
+
public String getRefundChannel() {
return this.refundChannel;
}
-
+
public void setRefundChannel(String refundChannel) {
this.refundChannel = refundChannel;
}
-
+
public String getRefundFee() {
return this.refundFee;
}
-
+
public void setRefundFee(String refundFee) {
this.refundFee = refundFee;
}
-
+
public String getTotalFee() {
return this.totalFee;
}
-
+
public void setTotalFee(String totalFee) {
this.totalFee = totalFee;
}
-
+
public String getFeeType() {
return this.feeType;
}
-
+
public void setFeeType(String feeType) {
this.feeType = feeType;
}
-
+
public String getCashFee() {
return this.cashFee;
}
-
+
public void setCashFee(String cashFee) {
this.cashFee = cashFee;
}
-
- public String getCashRefundfee() {
- return this.cashRefundfee;
+
+ public String getCashRefundFee() {
+ return this.cashRefundFee;
}
-
- public void setCashRefundfee(String cashRefundfee) {
- this.cashRefundfee = cashRefundfee;
+
+ public void setCashRefundFee(String cashRefundFee) {
+ this.cashRefundFee = cashRefundFee;
}
-
+
public String getCouponRefundFee() {
return this.couponRefundFee;
}
-
+
public void setCouponRefundFee(String couponRefundFee) {
this.couponRefundFee = couponRefundFee;
}
-
+
public String getCouponRefundCount() {
return this.couponRefundCount;
}
-
+
public void setCouponRefundCount(String couponRefundCount) {
this.couponRefundCount = couponRefundCount;
}
-
+
public String getCouponRefundId() {
return this.couponRefundId;
}
-
+
public void setCouponRefundId(String couponRefundId) {
this.couponRefundId = couponRefundId;
}
-
+
@Override
public String toString() {
- return "[" +
- "return_code:" + this.returnCode + ";" +
- "return_msg" + this.returnMsg + ";";
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java
deleted file mode 100644
index cff9d787..00000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package me.chanjar.weixin.mp.bean.pay;
-
-import java.io.Serializable;
-
-/**
- *
- * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识"返回的结果
- * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
- *
- *
- * @author chanjarster
- */
-@Deprecated
-public class WxMpPrepayIdResult implements Serializable {
- private static final long serialVersionUID = -8970574397788396143L;
- private String return_code;
- private String return_msg;
- private String appid;
- private String mch_id;
- private String nonce_str;
- private String sign;
- private String result_code;
- private String prepay_id;
- private String trade_type;
- private String err_code;
- private String err_code_des;
- private String code_url;
-
- public String getReturn_code() {
- return this.return_code;
- }
-
- public void setReturn_code(String return_code) {
- this.return_code = return_code;
- }
-
- public String getReturn_msg() {
- return this.return_msg;
- }
-
- public void setReturn_msg(String return_msg) {
- this.return_msg = return_msg;
- }
-
- public String getAppid() {
- return this.appid;
- }
-
- public void setAppid(String appid) {
- this.appid = appid;
- }
-
- public String getMch_id() {
- return this.mch_id;
- }
-
- public void setMch_id(String mch_id) {
- this.mch_id = mch_id;
- }
-
- public String getNonce_str() {
- return this.nonce_str;
- }
-
- public void setNonce_str(String nonce_str) {
- this.nonce_str = nonce_str;
- }
-
- public String getSign() {
- return this.sign;
- }
-
- public void setSign(String sign) {
- this.sign = sign;
- }
-
- public String getResult_code() {
- return this.result_code;
- }
-
- public void setResult_code(String result_code) {
- this.result_code = result_code;
- }
-
- public String getPrepay_id() {
- return this.prepay_id;
- }
-
- public void setPrepay_id(String prepay_id) {
- this.prepay_id = prepay_id;
- }
-
- public String getTrade_type() {
- return this.trade_type;
- }
-
- public void setTrade_type(String trade_type) {
- this.trade_type = trade_type;
- }
-
- public String getErr_code() {
- return this.err_code;
- }
-
- public void setErr_code(String err_code) {
- this.err_code = err_code;
- }
-
- public String getErr_code_des() {
- return this.err_code_des;
- }
-
- public void setErr_code_des(String err_code_des) {
- this.err_code_des = err_code_des;
- }
-
- public String getCode_url() {
- return this.code_url;
- }
-
- public void setCode_url(String code_url) {
- this.code_url = code_url;
- }
-}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java
index ccdfff90..4173c373 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java
@@ -11,7 +11,7 @@ import me.chanjar.weixin.common.annotation.Required;
*
* 统一下单请求参数对象
* 参考文档:https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
- * 每个字段描述对应如下:
+ * 注释中各行每个字段描述对应如下:
*
字段名
* 变量名
* 是否必填
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
index 19d03abf..f56ccf5c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
@@ -121,6 +121,9 @@ public class WxMpUser implements Serializable {
this.subscribeTime = subscribeTime;
}
+ /**
+ *只有在将公众号绑定到微信开放平台帐号后,才会出现该字段。
+ */
public String getUnionId() {
return this.unionId;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
index 06a5b178..5dbd9e4e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
@@ -1,21 +1,19 @@
package me.chanjar.weixin.mp.bean.store;
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
-
import me.chanjar.weixin.common.annotation.Required;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
* 门店基础信息
- * @author binarywang(https://github.com/binarywang)
+ * @author binarywang(Binary Wang)
* Created by Binary Wang on 2016-09-23.
*/
public class WxMpStoreBaseInfo {
@@ -24,6 +22,10 @@ public class WxMpStoreBaseInfo {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
}
+ public static WxMpStoreBaseInfo fromJson(String json) {
+ return WxMpGsonBuilder.create().fromJson(json, WxMpStoreBaseInfo.class);
+ }
+
public String toJson() {
JsonElement base_info = WxMpGsonBuilder.create().toJsonTree(this);
JsonObject jsonObject = new JsonObject();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
index 48b01822..864d9d2c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
@@ -22,4 +22,4 @@ public class WxMpStoreInfo {
this.baseInfo = baseInfo;
}
-}
\ No newline at end of file
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
index 2bc514ed..e02ae056 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
@@ -11,7 +11,7 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 门店列表结果类
- * @author binarywang(https://github.com/binarywang)
+ * @author binarywang(Binary Wang)
* Created by Binary Wang on 2016-09-27.
*
*/
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
index 0ba48edc..3d7f57f3 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
@@ -1,15 +1,17 @@
package me.chanjar.weixin.mp.bean.tag;
-import com.google.gson.annotations.SerializedName;
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+import java.util.List;
+
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import java.util.List;
+import com.google.gson.annotations.SerializedName;
+
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 获取标签下粉丝列表的结果对象
- * @author binarywang(https://github.com/binarywang)
+ * @author binarywang(Binary Wang)
* Created by Binary Wang on 2016-09-19.
*/
public class WxTagListUser {
@@ -46,7 +48,7 @@ public class WxTagListUser {
private String nextOpenid;
public Integer getCount() {
- return count;
+ return this.count;
}
public void setCount(Integer count) {
@@ -54,7 +56,7 @@ public class WxTagListUser {
}
public WxTagListUserData getData() {
- return data;
+ return this.data;
}
public void setData(WxTagListUserData data) {
@@ -62,7 +64,7 @@ public class WxTagListUser {
}
public String getNextOpenid() {
- return nextOpenid;
+ return this.nextOpenid;
}
public void setNextOpenid(String nextOpenid) {
@@ -82,7 +84,7 @@ public class WxTagListUser {
private List openidList;
public List getOpenidList() {
- return openidList;
+ return this.openidList;
}
public void setOpenidList(List openidList) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
index d9e07d04..281b9b30 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
@@ -12,14 +12,14 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 用户标签对象
- * @author binarywang(https://github.com/binarywang)
+ * @author binarywang(Binary Wang)
* Created by Binary Wang on 2016/9/2.
*/
public class WxUserTag {
/**
* id 标签id,由微信分配
*/
- private Integer id;
+ private Long id;
/**
* name 标签名,UTF8编码
@@ -47,11 +47,11 @@ public class WxUserTag {
this.count = count;
}
- public Integer getId() {
+ public Long getId() {
return this.id;
}
- public void setId(Integer id) {
+ public void setId(Long id) {
this.id = id;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java
deleted file mode 100644
index a6a48ed7..00000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * KINGSTAR MEDIA SOLUTIONS Co.,LTD. Copyright c 2005-2013. All rights reserved.
- *
- * This source code is the property of KINGSTAR MEDIA SOLUTIONS LTD. It is intended
- * only for the use of KINGSTAR MEDIA application development. Reengineering, reproduction
- * arose from modification of the original source, or other redistribution of this source
- * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
- */
-package me.chanjar.weixin.mp.util.json;
-
-import com.google.gson.*;
-import me.chanjar.weixin.common.util.json.GsonHelper;
-import me.chanjar.weixin.mp.bean.WxMpGroup;
-
-import java.lang.reflect.Type;
-
-public class WxMpGroupGsonAdapter implements JsonSerializer, JsonDeserializer {
-
- @Override
- public JsonElement serialize(WxMpGroup group, Type typeOfSrc, JsonSerializationContext context) {
- JsonObject json = new JsonObject();
- JsonObject groupJson = new JsonObject();
- groupJson.addProperty("name", group.getName());
- groupJson.addProperty("id", group.getId());
- groupJson.addProperty("count", group.getCount());
- json.add("group", groupJson);
- return json;
- }
-
- @Override
- public WxMpGroup deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
- WxMpGroup group = new WxMpGroup();
- JsonObject groupJson = json.getAsJsonObject();
- if (json.getAsJsonObject().get("group") != null) {
- groupJson = json.getAsJsonObject().get("group").getAsJsonObject();
- }
- if (groupJson.get("name") != null && !groupJson.get("name").isJsonNull()) {
- group.setName(GsonHelper.getAsString(groupJson.get("name")));
- }
- if (groupJson.get("id") != null && !groupJson.get("id").isJsonNull()) {
- group.setId(GsonHelper.getAsPrimitiveLong(groupJson.get("id")));
- }
- if (groupJson.get("count") != null && !groupJson.get("count").isJsonNull()) {
- group.setCount(GsonHelper.getAsPrimitiveLong(groupJson.get("count")));
- }
- return group;
- }
-
-}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
index ab3d5769..df63ac64 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -2,10 +2,35 @@ package me.chanjar.weixin.mp.util.json;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import me.chanjar.weixin.mp.bean.*;
+
+import me.chanjar.weixin.mp.bean.WxMpCard;
+import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
+import me.chanjar.weixin.mp.bean.WxMpIndustry;
+import me.chanjar.weixin.mp.bean.WxMpMassNews;
+import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
+import me.chanjar.weixin.mp.bean.WxMpMassPreviewMessage;
+import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
+import me.chanjar.weixin.mp.bean.WxMpMassVideo;
+import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate;
+import me.chanjar.weixin.mp.bean.WxMpMaterialNews;
+import me.chanjar.weixin.mp.bean.WxMpTemplateMessage;
import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
-import me.chanjar.weixin.mp.bean.result.*;
+import me.chanjar.weixin.mp.bean.result.WxMediaImgUploadResult;
+import me.chanjar.weixin.mp.bean.result.WxMpCardResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialCountResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialFileBatchGetResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialNewsBatchGetResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialUploadResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMaterialVideoInfoResult;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
+import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
+import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
+import me.chanjar.weixin.mp.bean.result.WxMpUserList;
public class WxMpGsonBuilder {
@@ -15,9 +40,8 @@ public class WxMpGsonBuilder {
INSTANCE.disableHtmlEscaping();
INSTANCE.registerTypeAdapter(WxMpCustomMessage.class, new WxMpCustomMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassNews.class, new WxMpMassNewsGsonAdapter());
- INSTANCE.registerTypeAdapter(WxMpMassGroupMessage.class, new WxMpMassGroupMessageGsonAdapter());
+ INSTANCE.registerTypeAdapter(WxMpMassTagMessage.class, new WxMpMassTagMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassOpenIdsMessage.class, new WxMpMassOpenIdsMessageGsonAdapter());
- INSTANCE.registerTypeAdapter(WxMpGroup.class, new WxMpGroupGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpUser.class, new WxMpUserGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpUserList.class, new WxUserListGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassVideo.class, new WxMpMassVideoAdapter());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassTagMessageGsonAdapter.java
similarity index 85%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassTagMessageGsonAdapter.java
index 4ad45848..6514ed59 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassGroupMessageGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassTagMessageGsonAdapter.java
@@ -8,27 +8,28 @@
*/
package me.chanjar.weixin.mp.util.json;
+import java.lang.reflect.Type;
+
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import me.chanjar.weixin.common.api.WxConsts;
-import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage;
-import java.lang.reflect.Type;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
-public class WxMpMassGroupMessageGsonAdapter implements JsonSerializer {
+public class WxMpMassTagMessageGsonAdapter implements JsonSerializer {
@Override
- public JsonElement serialize(WxMpMassGroupMessage message, Type typeOfSrc, JsonSerializationContext context) {
+ public JsonElement serialize(WxMpMassTagMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
JsonObject filter = new JsonObject();
- if(null == message.getGroupId()) {
+ if(null == message.getTagId()) {
filter.addProperty("is_to_all", true);
} else {
filter.addProperty("is_to_all", false);
- filter.addProperty("group_id", message.getGroupId());
+ filter.addProperty("tag_id", message.getTagId());
}
messageJson.add("filter", filter);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
index 3f2c28b8..e093d575 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
@@ -14,9 +14,9 @@ import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage;
import me.chanjar.weixin.mp.bean.WxMpMassNews;
import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
+import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
import me.chanjar.weixin.mp.bean.WxMpMassVideo;
import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
@@ -68,11 +68,11 @@ public class WxMpMassMessageAPITest {
@Test
public void testTextMassGroupMessageSend() throws WxErrorException {
- WxMpMassGroupMessage massMessage = new WxMpMassGroupMessage();
+ WxMpMassTagMessage massMessage = new WxMpMassTagMessage();
massMessage.setMsgtype(WxConsts.MASS_MSG_TEXT);
massMessage.setContent("测试群发消息\n欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
massMessage
- .setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
+ .setTagId(this.wxService.getUserTagService().tagGet().get(0).getId());
WxMpMassSendResult massResult = this.wxService
.massGroupMessageSend(massMessage);
@@ -83,11 +83,11 @@ public class WxMpMassMessageAPITest {
@Test(dataProvider="massMessages")
public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
throws WxErrorException {
- WxMpMassGroupMessage massMessage = new WxMpMassGroupMessage();
+ WxMpMassTagMessage massMessage = new WxMpMassTagMessage();
massMessage.setMsgtype(massMsgType);
massMessage.setMediaId(mediaId);
massMessage
- .setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
+ .setTagId(this.wxService.getUserTagService().tagGet().get(0).getId());
WxMpMassSendResult massResult = this.wxService
.massGroupMessageSend(massMessage);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
index 07a1b75a..fdc90744 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
@@ -195,7 +195,7 @@ public class WxMpMessageRouterTest {
.rule().async(false).handler(new WxSessionMessageHandler()).end();
WxMpXmlMessage msg = new WxMpXmlMessage();
- msg.setFromUserName("abc");
+ msg.setFromUser("abc");
router.route(msg);
Thread.sleep(2000l);
@@ -215,7 +215,7 @@ public class WxMpMessageRouterTest {
.rule().async(true).handler(new WxSessionMessageHandler()).end();
WxMpXmlMessage msg = new WxMpXmlMessage();
- msg.setFromUserName("abc");
+ msg.setFromUser("abc");
router.route(msg);
Thread.sleep(2000l);
@@ -229,7 +229,7 @@ public class WxMpMessageRouterTest {
.rule().async(false).handler(new WxSessionMessageHandler()).end();
WxMpXmlMessage msg = new WxMpXmlMessage();
- msg.setFromUserName("abc");
+ msg.setFromUser("abc");
router.route(msg);
Thread.sleep(2000l);
@@ -249,7 +249,7 @@ public class WxMpMessageRouterTest {
.rule().async(true).handler(new WxSessionMessageHandler()).end();
WxMpXmlMessage msg = new WxMpXmlMessage();
- msg.setFromUserName("abc");
+ msg.setFromUser("abc");
router.route(msg);
Thread.sleep(2000l);
@@ -268,7 +268,7 @@ public class WxMpMessageRouterTest {
.rule().async(false).handler(new WxSessionMessageHandler()).end();
WxMpXmlMessage msg = new WxMpXmlMessage();
- msg.setFromUserName("abc");
+ msg.setFromUser("abc");
router.route(msg);
Thread.sleep(2000l);
@@ -282,7 +282,7 @@ public class WxMpMessageRouterTest {
.rule().async(true).handler(new WxSessionMessageHandler()).end();
WxMpXmlMessage msg = new WxMpXmlMessage();
- msg.setFromUserName("abc");
+ msg.setFromUser("abc");
router.route(msg);
Thread.sleep(2000l);
@@ -295,7 +295,7 @@ public class WxMpMessageRouterTest {
@Override
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context, WxMpService wxMpService,
WxSessionManager sessionManager) {
- sessionManager.getSession(wxMessage.getFromUserName());
+ sessionManager.getSession(wxMessage.getFromUser());
return null;
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
deleted file mode 100644
index 2216e553..00000000
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package me.chanjar.weixin.mp.api.impl;
-
-import com.google.inject.Inject;
-import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.mp.api.ApiTestModule;
-import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
-import me.chanjar.weixin.mp.bean.WxMpGroup;
-import org.testng.Assert;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-/**
- * 测试分组接口
- *
- * @author chanjarster
- */
-@Deprecated
-@Test(groups = "groupAPI")
-@Guice(modules = ApiTestModule.class)
-public class WxMpGroupServiceImplTest {
-
- @Inject
- protected WxMpServiceImpl wxService;
-
- protected WxMpGroup group;
-
- public void testGroupCreate() throws WxErrorException {
- WxMpGroup res = this.wxService.getGroupService().groupCreate("测试分组1");
- Assert.assertEquals(res.getName(), "测试分组1");
- }
-
- @Test(dependsOnMethods="testGroupCreate")
- public void testGroupGet() throws WxErrorException {
- List groupList = this.wxService.getGroupService().groupGet();
- Assert.assertNotNull(groupList);
- Assert.assertTrue(groupList.size() > 0);
- for (WxMpGroup g : groupList) {
- this.group = g;
- Assert.assertNotNull(g.getName());
- }
- }
-
- @Test(dependsOnMethods={"testGroupGet", "testGroupCreate"})
- public void getGroupUpdate() throws WxErrorException {
- this.group.setName("分组改名");
- this.wxService.getGroupService().groupUpdate(this.group);
- }
-
- public void testGroupQueryUserGroup() throws WxErrorException {
- WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
- long groupid = this.wxService.getGroupService().userGetGroup(configStorage.getOpenid());
- Assert.assertTrue(groupid != -1l);
- }
-
- public void testGroupMoveUser() throws WxErrorException {
- WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
- this.wxService.getGroupService().userUpdateGroup(configStorage.getOpenid(), this.wxService.getGroupService().groupGet().get(3).getId());
- }
-
-}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
index 1982f948..6d0b8a5c 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
@@ -1,17 +1,14 @@
package me.chanjar.weixin.mp.api.impl;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
import com.google.inject.Inject;
-
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.mp.api.ApiTestModule;
import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
-import me.chanjar.weixin.mp.bean.pay.WxRedpackResult;
-import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest;
-import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest;
-import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderResult;
+import me.chanjar.weixin.mp.bean.pay.*;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.File;
/**
* 测试支付相关接口
@@ -25,21 +22,6 @@ public class WxMpPayServiceImplTest {
@Inject
protected WxMpServiceImpl wxService;
- @Test
- public void testGetPrepayId() throws Exception {
-
- }
-
- @Test
- public void testGetJsapiPayInfo() throws Exception {
-
- }
-
- @Test
- public void testGetNativePayInfo() throws Exception {
-
- }
-
@Test
public void testGetPayInfo() throws Exception {
@@ -56,8 +38,15 @@ public class WxMpPayServiceImplTest {
}
@Test
- public void testRefundPay() throws Exception {
-
+ public void testRefund() throws Exception {
+ WxMpPayRefundRequest request = new WxMpPayRefundRequest();
+ request.setOutRefundNo("aaa");
+ request.setOutTradeNo("1111");
+ request.setTotalFee(1222);
+ request.setRefundFee(111);
+ File keyFile = new File("E:\\dlt.p12");
+ WxMpPayRefundResult result = this.wxService.getPayService().refund(request, keyFile);
+ System.err.println(result);
}
@Test
@@ -73,13 +62,14 @@ public class WxMpPayServiceImplTest {
request.setMchBillno("aaaa");
request
.setReOpenid(((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
- WxRedpackResult redpackResult = this.wxService.getPayService().sendRedpack(request);
+ File keyFile = new File("E:\\dlt.p12");
+ WxRedpackResult redpackResult = this.wxService.getPayService().sendRedpack(request, keyFile);
System.err.println(redpackResult);
}
/**
* Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpPayServiceImpl#unifiedOrder(me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest)}.
- * @throws WxErrorException
+ * @throws WxErrorException
*/
@Test
public void testUnifiedOrder() throws WxErrorException {
@@ -89,4 +79,16 @@ public class WxMpPayServiceImplTest {
.tradeType("JSAPI").openid("122").outTradeNo("111111").build());
System.err.println(result);
}
-}
\ No newline at end of file
+
+ /**
+ * Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpPayServiceImpl#entPay(WxEntPayRequest, File)}.
+ * @throws WxErrorException
+ */
+ @Test
+ public final void testEntPay() throws WxErrorException {
+ File keyFile = new File("E:\\dlt.p12");
+ WxEntPayRequest request = new WxEntPayRequest();
+ System.err.println(this.wxService.getPayService().entPay(request, keyFile));
+ }
+
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java
index 9c28dfa7..6e31b769 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java
@@ -1,23 +1,22 @@
package me.chanjar.weixin.mp.api.impl;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
import com.google.inject.Inject;
-
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.mp.api.ApiTestModule;
import me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo;
import me.chanjar.weixin.mp.bean.store.WxMpStoreInfo;
import me.chanjar.weixin.mp.bean.store.WxMpStoreListResult;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.Assert.assertNotNull;
/**
- * @author 王彬 (Binary Wang)
+ * @author binarywang(Binary Wang)
+ * Created by Binary Wang on 2016-09-23.
*
*/
@Test
@@ -28,18 +27,41 @@ public class WxMpStoreServiceImplTest {
/**
* Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpStoreServiceImpl#add(me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo)}.
- * @throws WxErrorException
+ * @throws WxErrorException
*/
public void testAdd() throws WxErrorException {
this.wxMpService.getStoreService()
.add(WxMpStoreBaseInfo.builder().businessName("haha").branchName("abc")
- .province("aaa").district("aaa").telephone("122").address("abc")
-.categories(new String[] { "美食,江浙菜" })
+ .province("aaa").district("aaa").telephone("122").address("abc").categories(new String[] { "美食,江浙菜" })
.longitude(new BigDecimal("115.32375"))
.latitude(new BigDecimal("25.097486")).city("aaa").offsetType(1)
.build());
}
+ public void testUpdate() throws WxErrorException {
+ this.wxMpService.getStoreService()
+ .update(WxMpStoreBaseInfo.builder().poiId("291503654").telephone("020-12345678")
+ .sid("aaa").avgPrice(35).openTime("8:00-20:00").special("免费wifi,外卖服务")
+ .introduction("麦当劳是全球大型跨国连锁餐厅,1940 年创立于美国,在世界上大约拥有3 万间分店。主要售卖汉堡包,以及薯条、炸鸡、汽水、冰品、沙拉、水果等快餐食品").offsetType(1)
+ .build());
+ }
+
+ public void testGet() throws WxErrorException {
+ WxMpStoreBaseInfo result = this.wxMpService.getStoreService().get("291503654");
+ assertNotNull(result);
+ System.err.println(result);
+ }
+
+ public void testDelete() throws WxErrorException {
+ this.wxMpService.getStoreService().delete("463558057");
+ }
+
+ public void testListCategories() throws WxErrorException {
+ List result = this.wxMpService.getStoreService().listCategories();
+ assertNotNull(result);
+ System.err.println(result);
+ }
+
public void testList() throws WxErrorException {
WxMpStoreListResult result = this.wxMpService.getStoreService().list(0, 10);
assertNotNull(result);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
index 74a6cfc4..4fca56be 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
@@ -13,7 +13,7 @@ import java.util.List;
/**
*
- * @author binarywang(https://github.com/binarywang)
+ * @author binarywang(Binary Wang)
* Created by Binary Wang on 2016/9/2.
*/
@Test
@@ -22,7 +22,7 @@ public class WxMpUserTagServiceImplTest {
@Inject
protected WxMpServiceImpl wxService;
- private Integer tagId = 2;
+ private Long tagId = 2L;
@Test
public void testTagCreate() throws Exception {
@@ -62,6 +62,14 @@ public class WxMpUserTagServiceImplTest {
Assert.assertNotNull(res);
}
+ @Test
+ public void testBatchTagging() throws Exception {
+ String[] openids = new String[]{((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()};
+ boolean res = this.wxService.getUserTagService().batchTagging(this.tagId, openids);
+ System.out.println(res);
+ Assert.assertTrue(res);
+ }
+
@Test
public void testBatchUntagging() throws Exception {
String[] openids = new String[]{((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()};
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlMessageTest.java
index 3885ec32..87d8428b 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlMessageTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlMessageTest.java
@@ -54,8 +54,8 @@ public class WxMpXmlMessageTest {
+ ""
+ "";
WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml);
- Assert.assertEquals(wxMessage.getToUserName(), "toUser");
- Assert.assertEquals(wxMessage.getFromUserName(), "fromUser");
+ Assert.assertEquals(wxMessage.getToUser(), "toUser");
+ Assert.assertEquals(wxMessage.getFromUser(), "fromUser");
Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
Assert.assertEquals(wxMessage.getContent(), "this is a test");
@@ -135,8 +135,8 @@ public class WxMpXmlMessageTest {
+ ""
+ "";
WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml);
- Assert.assertEquals(wxMessage.getToUserName(), "toUser");
- Assert.assertEquals(wxMessage.getFromUserName(), "fromUser");
+ Assert.assertEquals(wxMessage.getToUser(), "toUser");
+ Assert.assertEquals(wxMessage.getFromUser(), "fromUser");
Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
Assert.assertEquals(wxMessage.getContent(), "this is a test");
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
index a6fb1e53..f35b3b87 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
@@ -50,18 +50,18 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
}
protected void letsGo(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
- WxSession session = sessionManager.getSession(wxMessage.getFromUserName());
+ WxSession session = sessionManager.getSession(wxMessage.getFromUser());
if (session.getAttribute("guessing") == null) {
WxMpCustomMessage m = WxMpCustomMessage
.TEXT()
- .toUser(wxMessage.getFromUserName())
+ .toUser(wxMessage.getFromUser())
.content("请猜一个100以内的数字")
.build();
wxMpService.getKefuService().customMessageSend(m);
} else {
WxMpCustomMessage m = WxMpCustomMessage
.TEXT()
- .toUser(wxMessage.getFromUserName())
+ .toUser(wxMessage.getFromUser())
.content("放弃了吗?那请重新猜一个100以内的数字")
.build();
wxMpService.getKefuService().customMessageSend(m);
@@ -74,7 +74,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
- WxSession session = sessionManager.getSession(wxMessage.getFromUserName());
+ WxSession session = sessionManager.getSession(wxMessage.getFromUser());
if (session.getAttribute("guessing") == null) {
return;
@@ -89,7 +89,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
if (guessNumber < answer) {
WxMpCustomMessage m = WxMpCustomMessage
.TEXT()
- .toUser(wxMessage.getFromUserName())
+ .toUser(wxMessage.getFromUser())
.content("小了")
.build();
wxMpService.getKefuService().customMessageSend(m);
@@ -97,14 +97,14 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
} else if (guessNumber > answer) {
WxMpCustomMessage m = WxMpCustomMessage
.TEXT()
- .toUser(wxMessage.getFromUserName())
+ .toUser(wxMessage.getFromUser())
.content("大了")
.build();
wxMpService.getKefuService().customMessageSend(m);
} else {
WxMpCustomMessage m = WxMpCustomMessage
.TEXT()
- .toUser(wxMessage.getFromUserName())
+ .toUser(wxMessage.getFromUser())
.content("Bingo!")
.build();
session.removeAttribute("guessing");
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java
index a22f28d7..cd733210 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java
@@ -24,8 +24,8 @@ public class DemoImageHandler implements WxMpMessageHandler {
= WxMpXmlOutMessage
.IMAGE()
.mediaId(wxMediaUploadResult.getMediaId())
- .fromUser(wxMessage.getToUserName())
- .toUser(wxMessage.getFromUserName())
+ .fromUser(wxMessage.getToUser())
+ .toUser(wxMessage.getFromUser())
.build();
return m;
} catch (WxErrorException e) {
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java
index de1c9546..5dc5437d 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java
@@ -21,7 +21,7 @@ public class DemoOAuth2Handler implements WxMpMessageHandler {
wxMpService.getWxMpConfigStorage().getOauth2redirectUri(),
WxConsts.OAUTH2_SCOPE_USER_INFO, null) + "\">测试oauth2";
return WxMpXmlOutMessage.TEXT().content(href)
- .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
+ .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
.build();
}
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java
index 43f017be..9ee15a28 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java
@@ -17,8 +17,8 @@ public class DemoTextHandler implements WxMpMessageHandler {
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context,
WxMpService wxMpService, WxSessionManager sessionManager) {
WxMpXmlOutTextMessage m
- = WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName())
- .toUser(wxMessage.getFromUserName()).build();
+ = WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUser())
+ .toUser(wxMessage.getFromUser()).build();
return m;
}
diff --git a/weixin-java-mp/src/test/resources/test-config.sample.xml b/weixin-java-mp/src/test/resources/test-config.sample.xml
index ad46a19e..2bbc8d8e 100644
--- a/weixin-java-mp/src/test/resources/test-config.sample.xml
+++ b/weixin-java-mp/src/test/resources/test-config.sample.xml
@@ -6,6 +6,8 @@
可以不填写
可以不填写
某个加你公众号的用户的openId
+ 微信商户平台ID
+ 商户平台设置的API密钥
模版消息的模版ID
网页授权获取用户信息回调地址
网页应用授权登陆回调地址
diff --git a/weixin-java-mp/src/test/resources/testng.xml b/weixin-java-mp/src/test/resources/testng.xml
index d821e398..6d5310ce 100644
--- a/weixin-java-mp/src/test/resources/testng.xml
+++ b/weixin-java-mp/src/test/resources/testng.xml
@@ -5,9 +5,6 @@
-
-
-