add apple pay and delete getcredential

shenlin · shenlin · commit b1022e44184e · 2015-04-16T13:12:18.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
  
+## 2.0.3
+* 增加 apple pay ，删除 getcredential 方法。
+
 ## 2.0.2
 * 增加微信红包
 
diff --git a/src/main/java/com/pingplusplus/Pingpp.java b/src/main/java/com/pingplusplus/Pingpp.java
@@ -3,9 +3,9 @@
 public abstract class Pingpp
 {
 	public static final String LIVE_API_BASE = "https://api.pingxx.com";
-	public static final String VERSION = "2.0.2";
+	public static final String VERSION = "2.0.3";
 	public static volatile String apiKey;
-	public static volatile String apiVersion = "2015-04-01";
+	public static volatile String apiVersion = "2015-04-16";
 
 	private static volatile boolean verifySSL = true;
 	private static volatile String apiBase = LIVE_API_BASE;
diff --git a/src/main/java/com/pingplusplus/model/Charge.java b/src/main/java/com/pingplusplus/model/Charge.java
@@ -208,15 +208,6 @@ public void setApp(Object app) {
         this.app = app;
     }
 
-    public String getCredential() {
-        Map<String, Object> credParams = new HashMap<String, Object>();
-        if (!credential.isEmpty()) {
-            credParams.put("object", "credential");
-            credParams.put(channel, credential.get(channel));
-        }
-        return PRETTY_PRINT_GSON.toJson(credParams);
-    }
-
     public void setCredential(Map<String, Object> credential) {
         this.credential = credential;
     }
diff --git a/src/main/java/com/pingplusplus/model/ChargeDeserializer.java b/src/main/java/com/pingplusplus/model/ChargeDeserializer.java
@@ -11,28 +11,22 @@
  */
 public class ChargeDeserializer implements JsonDeserializer<Charge> {
 
-    @Override
-    public Charge deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-        Gson gson = new GsonBuilder()
-                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-                .registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
-                .registerTypeAdapter(PingppRawJsonObject.class, new PingppRawJsonObjectDeserializer())
-                .create();
-        Charge charge = gson.fromJson(jsonElement, Charge.class);
-        final JsonObject obj = jsonElement.getAsJsonObject();
-        final JsonElement appElement = obj.get("app");
-        if (appElement != null && appElement.isJsonObject()) {
-            App app = gson.fromJson(appElement, App.class);
-            charge.setApp(app);
-        }
-        String creStr = charge.getCredential();
-        Type hashMapType = new TypeToken<Map<String, Object>>(){}.getType();
-        Map<String, Object> creMap = gson.fromJson(creStr, hashMapType);
-        if (creMap.containsKey("wx")) {
-            Map<String, Object> wx = (Map<String, Object>) creMap.get("wx");
-            wx.put("timeStamp", String.valueOf(((Double)(wx.get("timeStamp"))).longValue()));
-            charge.setCredential(creMap);
-        }
-        return charge;
-    }
+	@Override
+	public Charge deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+
+		JsonObject chargeJson = jsonElement.getAsJsonObject();
+		if (null != chargeJson.getAsJsonObject("credential")) {
+			JsonObject credentialJson = chargeJson.getAsJsonObject("credential");
+			if (null != credentialJson.getAsJsonObject("wx")) {
+				JsonObject wx = credentialJson.getAsJsonObject("wx");
+				Long timeStamp = wx.get("timeStamp").getAsLong();
+				wx.addProperty("timeStamp", "" + timeStamp);
+			}
+		}
+		
+		Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).registerTypeAdapter(ChargeRefundCollection.class, new ChargeRefundCollectionDeserializer())
+				.registerTypeAdapter(PingppRawJsonObject.class, new PingppRawJsonObjectDeserializer()).create();
+		Charge charge = gson.fromJson(jsonElement, Charge.class);
+		return charge;
+	}
 }
