From dd718bbcfc0834d889d0a01ff322a1dad52f7125 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Fri, 20 May 2016 16:40:46 +0800
Subject: [PATCH] openid->openId

---
 .../weixin4j/payment/mch/Redpacket.java        | 18 +++++++++---------
 .../weixin4j/payment/mch/RedpacketRecord.java  | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
index 45c4a924..0576a913 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
@@ -43,7 +43,7 @@ public class Redpacket extends MerchantResult {
 	 */
 	@XmlElement(name = "re_openid")
 	@JSONField(name = "re_openid")
-	private String openid;
+	private String openId;
 	/**
 	 * 付款金额，单位分
 	 */
@@ -108,7 +108,7 @@ public class Redpacket extends MerchantResult {
 	 *            商户侧一天内不可重复的订单号 接口根据商户订单号支持重入 如出现超时可再调用 必填
 	 * @param sendName
 	 *            红包发送者名称 必填
-	 * @param openid
+	 * @param openId
 	 *            接受收红包的用户的openid 必填
 	 * @param totalAmount
 	 *            付款金额 <font color="red">单位为元,自动格式化为分</font> 必填
@@ -123,10 +123,10 @@ public class Redpacket extends MerchantResult {
 	 * @param remark
 	 *            备注 必填
 	 */
-	public Redpacket(String outTradeNo, String sendName, String openid,
+	public Redpacket(String outTradeNo, String sendName, String openId,
 			double totalAmount, int totalNum, String wishing, String clientIp,
 			String actName, String remark) {
-		this(null, null, outTradeNo, sendName, openid, totalAmount, totalNum,
+		this(null, null, outTradeNo, sendName, openId, totalAmount, totalNum,
 				wishing, clientIp, actName, remark);
 	}
 
@@ -158,13 +158,13 @@ public class Redpacket extends MerchantResult {
 	 *            备注 必填
 	 */
 	public Redpacket(String msgAppId, String consumeMchId, String outTradeNo,
-			String sendName, String openid, double totalAmount, int totalNum,
+			String sendName, String openId, double totalAmount, int totalNum,
 			String wishing, String clientIp, String actName, String remark) {
 		this.msgAppId = msgAppId;
 		this.consumeMchId = consumeMchId;
 		this.outTradeNo = outTradeNo;
 		this.sendName = sendName;
-		this.openid = openid;
+		this.openId = openId;
 		this.totalNum = totalNum;
 		this.wishing = wishing;
 		this.clientIp = clientIp;
@@ -182,8 +182,8 @@ public class Redpacket extends MerchantResult {
 		return sendName;
 	}
 
-	public String getOpenid() {
-		return openid;
+	public String getOpenId() {
+		return openId;
 	}
 
 	public String getTotalAmount() {
@@ -218,7 +218,7 @@ public class Redpacket extends MerchantResult {
 	public String toString() {
 		return "Redpacket [msgAppId=" + msgAppId + ", consumeMchId="
 				+ consumeMchId + ", outTradeNo=" + outTradeNo + ", sendName="
-				+ sendName + ", openid=" + openid + ", totalAmount="
+				+ sendName + ", openId=" + openId + ", totalAmount="
 				+ totalAmount + ", totalNum=" + totalNum + ", amtType="
 				+ amtType + ", wishing=" + wishing + ", clientIp=" + clientIp
 				+ ", actName=" + actName + ", remark=" + remark + ", "
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java
index 63aaf5f6..de1c35a7 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java
@@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.util.DateUtil;
 
 /**
  * 红包记录
- * 
+ *
  * @className RedpacketRecord
  * @author jinyu(foxinmy@gmail.com)
  * @date 2015年6月4日
@@ -176,7 +176,7 @@ public class RedpacketRecord extends XmlResult {
 
 	/**
 	 * <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
-	 * 
+	 *
 	 * @return 元单位
 	 */
 	@JSONField(serialize = false)
@@ -214,7 +214,7 @@ public class RedpacketRecord extends XmlResult {
 
 	/**
 	 * <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
-	 * 
+	 *
 	 * @return 元单位
 	 */
 	@JSONField(serialize = false)
@@ -248,7 +248,7 @@ public class RedpacketRecord extends XmlResult {
 		 * 领取红包的Openid
 		 */
 		@XmlElement(name = "openid")
-		private String openid;
+		private String openId;
 		/**
 		 * 领取状态
 		 */
@@ -265,8 +265,8 @@ public class RedpacketRecord extends XmlResult {
 		@JSONField(name = "rcv_time")
 		private String receiveTime;
 
-		public String getOpenid() {
-			return openid;
+		public String getOpenId() {
+			return openId;
 		}
 
 		public RedpacketStatus getStatus() {
@@ -283,7 +283,7 @@ public class RedpacketRecord extends XmlResult {
 
 		/**
 		 * <font color="red">调用接口获取单位为分,get方法转换为元方便使用</font>
-		 * 
+		 *
 		 * @return 元单位
 		 */
 		@JSONField(serialize = false)
@@ -299,7 +299,7 @@ public class RedpacketRecord extends XmlResult {
 
 		@Override
 		public String toString() {
-			return "RedpacketReceiver [openid=" + openid + ", status=" + status
+			return "RedpacketReceiver [openId=" + openId + ", status=" + status
 					+ ", amount=" + getFormatAmount() + ", receiveTime="
 					+ receiveTime + "]";
 		}