From 66417fdc8b4119156b906de321726b745aa1cf34 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Fri, 19 May 2017 16:09:20 +0800
Subject: [PATCH] fixed something

---
 .../http/support/apache3/HttpComponent3.java    |  2 +-
 .../weixin4j/payment/mch/RefundDetail.java      | 17 +++++++++++++++++
 .../com/foxinmy/weixin4j/type/ButtonType.java   |  4 ++++
 .../weixin4j/type/mch/RefundChannel.java        | 10 +++++++++-
 .../foxinmy/weixin4j/request/WeixinMessage.java |  5 +++--
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache3/HttpComponent3.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache3/HttpComponent3.java
index e214aa58..1abaf54d 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache3/HttpComponent3.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/support/apache3/HttpComponent3.java
@@ -76,7 +76,7 @@ public class HttpComponent3 extends AbstractHttpClient {
 	}
 
 	/**
-	 * Create HttpMethod
+	 * Create HttpRequest
 	 */
 	protected org.apache.commons.httpclient.HttpMethod createRequest(
 			HttpRequest request) throws HttpClientException, IOException {
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java
index 44f421f7..2ac72095 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java
@@ -1,6 +1,7 @@
 package com.foxinmy.weixin4j.payment.mch;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,6 +14,7 @@ import com.foxinmy.weixin4j.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.util.DateUtil;
 import com.foxinmy.weixin4j.xml.ListsuffixResult;
 
 /**
@@ -94,6 +96,12 @@ public class RefundDetail implements Serializable {
 	@XmlElement(name = "refund_recv_accout")
 	@JSONField(name = "refund_recv_accout")
 	private String refundRecvAccout;
+	/**
+	 * 退款成功时间，当退款状态为退款成功时有返回
+	 */
+	@XmlElement(name = "refund_success_time")
+	@JSONField(name = "refund_success_time")
+	private String refundSuccessTime;
 	/**
 	 * 退款代金券信息
 	 * 
@@ -188,6 +196,15 @@ public class RefundDetail implements Serializable {
 		return refundRecvAccout;
 	}
 
+	public String getRefundSuccessTime() {
+		return refundSuccessTime;
+	}
+	
+	@JSONField(serialize = false)
+	public Date getFormatRefundSuccessTime() {
+		return refundSuccessTime != null ? DateUtil.parse2yyyyMMddHHmmss(refundSuccessTime) : null;
+	}
+
 	@Override
 	public String toString() {
 		return "RefundDetail [outRefundNo=" + outRefundNo + ", refundId="
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java
index b8420d28..00b84112 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java
@@ -63,6 +63,10 @@ public enum ButtonType {
 	 * 永久素材类型只支持图文消息。 请注意：永久素材id必须是在“素材管理/新增永久素材”接口上传后获得的合法id。
 	 */
 	view_limited,
+	/**
+	 * 小程序
+	 */
+	miniprogram,
 	/**
 	 * 以下类型请勿使用,在公众平台设置的按钮类型,如果尝试使用API方式创建菜单则会出错。
 	 */
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java
index c3db14a9..144e49ab 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundChannel.java
@@ -25,5 +25,13 @@ public enum RefundChannel {
 	/**
 	 * 银行
 	 */
-	BANK;
+	BANK,
+	/**
+	 * 原账户异常退到其他余额账户
+	 */
+	OTHER_BALANCE,
+	/**
+	 * 原银行卡异常退到其他银行卡
+	 */
+	OTHER_BANKCARD
 }
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinMessage.java
index bd1fdd99..639a4180 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinMessage.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinMessage.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlTransient;
 
 import com.foxinmy.weixin4j.type.MessageType;
@@ -65,12 +66,12 @@ public class WeixinMessage implements Serializable {
 	/**
 	 * 消息ID 可用于排重
 	 */
-	@XmlElement(name = "MsgId")
+	@XmlElements({ @XmlElement(name = "MsgId"), @XmlElement(name = "MsgID") })
 	private long msgId;
 	/**
 	 * 企业号独有的应用ID
 	 */
-	@XmlElement(name = "AgentID")
+	@XmlElements({ @XmlElement(name = "AgentId"), @XmlElement(name = "AgentID") })
 	private String agentId;
 
 	public WeixinMessage() {