From f14b33a6420610643ceeca8c095975676752c209 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 4 Jun 2020 20:39:38 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1599=20=E4=BC=81=E4=B8=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E8=8E=B7=E5=8F=96=E6=89=93=E5=8D=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=BE=E5=A4=87id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/oa/WxCpCheckinData.java    | 45 +++++++++++++++++++
 .../result/WxPaySendRedpackResultTest.java    |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java
index b76553ca6..4ab801de1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpCheckinData.java
@@ -16,39 +16,84 @@ import java.util.List;
 public class WxCpCheckinData implements Serializable {
   private static final long serialVersionUID = 1915820330847799605L;
 
+  /**
+   * userid	用户id
+   */
   @SerializedName("userid")
   private String userId;
 
+  /**
+   * groupname	打卡规则名称
+   */
   @SerializedName("groupname")
   private String groupName;
 
+  /**
+   * checkin_type	打卡类型。字符串，目前有：上班打卡，下班打卡，外出打卡
+   */
   @SerializedName("checkin_type")
   private String checkinType;
 
+  /**
+   * exception_type	异常类型，字符串，包括：时间异常，地点异常，未打卡，wifi异常，非常用设备。如果有多个异常，以分号间隔
+   */
   @SerializedName("exception_type")
   private String exceptionType;
 
+  /**
+   * checkin_time	打卡时间。Unix时间戳
+   */
   @SerializedName("checkin_time")
   private Long checkinTime;
 
+  /**
+   * location_title	打卡地点title
+   */
   @SerializedName("location_title")
   private String locationTitle;
 
+  /**
+   * location_detail	打卡地点详情
+   */
   @SerializedName("location_detail")
   private String locationDetail;
 
+  /**
+   * wifiname	打卡wifi名称
+   */
   @SerializedName("wifiname")
   private String wifiName;
 
+  /**
+   * wifimac	打卡的MAC地址/bssid
+   */
   @SerializedName("wifimac")
   private String wifiMac;
 
+  /**
+   * notes	打卡备注
+   */
   private String notes;
 
+  /**
+   * mediaids	打卡的附件media_id，可使用media/get获取附件
+   */
   @SerializedName("mediaids")
   private List<String> mediaIds;
 
+  /**
+   * lat	位置打卡地点纬度，是实际纬度的1000000倍，与腾讯地图一致采用GCJ-02坐标系统标准
+   */
   private Integer lat;
 
+  /**
+   * lng	位置打卡地点经度，是实际经度的1000000倍，与腾讯地图一致采用GCJ-02坐标系统标准
+   */
   private Integer lng;
+
+  /**
+   * deviceid	打卡设备id
+   */
+  @SerializedName("deviceid")
+  private String deviceId;
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResultTest.java
index cb9007828..8ad4c246a 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResultTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResultTest.java
@@ -68,6 +68,6 @@ public class WxPaySendRedpackResultTest {
     Assert.assertEquals("FAIL", wxMpRedpackResult.getReturnCode());
     Assert.assertEquals("FAIL", wxMpRedpackResult.getResultCode());
     Assert.assertEquals("onqOjjmM1tad-3ROpncN-yUfa6uI", wxMpRedpackResult.getReOpenid());
-    Assert.assertEquals(Integer.valueOf(1), wxMpRedpackResult.getTotalAmount());
+    Assert.assertEquals(1, wxMpRedpackResult.getTotalAmount().intValue());
   }
 }