feat : again, cancel API 사용시 naverpay 옵션 parameter 대응

iamport · Oct 13, 2020 · 6204be2 · 6204be2
1 parent f1b5768
commit 6204be2
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ pom.xml에 아래의 내용을 추가해주세요.
 	<dependency>
 	    <groupId>com.github.iamport</groupId>
 	    <artifactId>iamport-rest-client-java</artifactId>
-	    <version>0.2.10</version>
+	    <version>0.2.11</version>
 	</dependency>
 </dependencies>
 ```

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>com.github.iamport</groupId>
 	<artifactId>iamport-rest-client</artifactId>
-	<version>0.2.10</version>
+	<version>0.2.11</version>
 	<packaging>jar</packaging>
 
 	<name>IamportRestClient</name>

diff --git a/src/main/java/com/siot/IamportRestClient/request/AgainPaymentData.java b/src/main/java/com/siot/IamportRestClient/request/AgainPaymentData.java
@@ -1,112 +1,123 @@
 package com.siot.IamportRestClient.request;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 
 public class AgainPaymentData {
 
-	@SerializedName("customer_uid")
-	private String customer_uid;
-
-	@SerializedName("merchant_uid")
-	private String merchant_uid;
-
-	@SerializedName("amount")
-	private BigDecimal amount;
-
-	@SerializedName("vat")
-	private BigDecimal vat;
-
-	@SerializedName("name")
-	private String name;
-
-	@SerializedName("buyer_name")
-	private String buyer_name;
-
-	@SerializedName("buyer_email")
-	private String buyer_email;
-
-	@SerializedName("buyer_tel")
-	private String buyer_tel;
-
-	@SerializedName("buyer_addr")
-	private String buyer_addr;
-
-	@SerializedName("buyer_postcode")
-	private String buyer_postcode;
-
-	@SerializedName("card_quota")
-	private int card_quota;
-
-	public AgainPaymentData(String customer_uid, String merchant_uid, BigDecimal amount) {
-		this.customer_uid = customer_uid;
-		this.merchant_uid = merchant_uid;
-		this.amount = amount;
-	}
-
-	public BigDecimal getVat() {
-		return vat;
-	}
-
-	public void setVat(BigDecimal vat) {
-		this.vat = vat;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getBuyerName() {
-		return buyer_name;
-	}
-
-	public void setBuyerName(String buyer_name) {
-		this.buyer_name = buyer_name;
-	}
-
-	public String getBuyerEmail() {
-		return buyer_email;
-	}
-
-	public void setBuyerEmail(String buyer_email) {
-		this.buyer_email = buyer_email;
-	}
-
-	public String getBuyerTel() {
-		return buyer_tel;
-	}
-
-	public void setBuyerTel(String buyer_tel) {
-		this.buyer_tel = buyer_tel;
-	}
-
-	public String getBuyerAddr() {
-		return buyer_addr;
-	}
-
-	public void setBuyerAddr(String buyer_addr) {
-		this.buyer_addr = buyer_addr;
-	}
-
-	public String getBuyerPostcode() {
-		return buyer_postcode;
-	}
-
-	public void setBuyerPostcode(String buyer_postcode) {
-		this.buyer_postcode = buyer_postcode;
-	}
-
-	public int getCardQuota() {
-		return card_quota;
-	}
-
-	public void setCardQuota(int card_quota) {
-		this.card_quota = card_quota;
-	}	
-
+    @SerializedName("customer_uid")
+    private String customer_uid;
+
+    @SerializedName("merchant_uid")
+    private String merchant_uid;
+
+    @SerializedName("amount")
+    private BigDecimal amount;
+
+    @SerializedName("vat")
+    private BigDecimal vat;
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("buyer_name")
+    private String buyer_name;
+
+    @SerializedName("buyer_email")
+    private String buyer_email;
+
+    @SerializedName("buyer_tel")
+    private String buyer_tel;
+
+    @SerializedName("buyer_addr")
+    private String buyer_addr;
+
+    @SerializedName("buyer_postcode")
+    private String buyer_postcode;
+
+    @SerializedName("card_quota")
+    private int card_quota;
+
+    @SerializedName("extra")
+    private ExtraNaverUseCfmEntry extra;
+
+    public AgainPaymentData(String customer_uid, String merchant_uid, BigDecimal amount) {
+        this.customer_uid = customer_uid;
+        this.merchant_uid = merchant_uid;
+        this.amount = amount;
+    }
+
+    public BigDecimal getVat() {
+        return vat;
+    }
+
+    public void setVat(BigDecimal vat) {
+        this.vat = vat;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBuyerName() {
+        return buyer_name;
+    }
+
+    public void setBuyerName(String buyer_name) {
+        this.buyer_name = buyer_name;
+    }
+
+    public String getBuyerEmail() {
+        return buyer_email;
+    }
+
+    public void setBuyerEmail(String buyer_email) {
+        this.buyer_email = buyer_email;
+    }
+
+    public String getBuyerTel() {
+        return buyer_tel;
+    }
+
+    public void setBuyerTel(String buyer_tel) {
+        this.buyer_tel = buyer_tel;
+    }
+
+    public String getBuyerAddr() {
+        return buyer_addr;
+    }
+
+    public void setBuyerAddr(String buyer_addr) {
+        this.buyer_addr = buyer_addr;
+    }
+
+    public String getBuyerPostcode() {
+        return buyer_postcode;
+    }
+
+    public void setBuyerPostcode(String buyer_postcode) {
+        this.buyer_postcode = buyer_postcode;
+    }
+
+    public int getCardQuota() {
+        return card_quota;
+    }
+
+    public void setCardQuota(int card_quota) {
+        this.card_quota = card_quota;
+    }
+
+    public ExtraNaverUseCfmEntry getExtra() {
+        return extra;
+    }
+
+    public void setExtra(ExtraNaverUseCfmEntry extra) {
+        this.extra = extra;
+    }
 }
diff --git a/src/main/java/com/siot/IamportRestClient/request/ExtraNaverUseCfmEntry.java b/src/main/java/com/siot/IamportRestClient/request/ExtraNaverUseCfmEntry.java
@@ -0,0 +1,20 @@
+package com.siot.IamportRestClient.request;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ExtraNaverUseCfmEntry {
+
+    @SerializedName("naverUseCfm")
+    private String naverUseCfm;
+
+    public ExtraNaverUseCfmEntry(String naverUseCfm) {
+        this.naverUseCfm = naverUseCfm;
+    }
+
+    public String getNaverUseCfm() {
+        return naverUseCfm;
+    }
+}
diff --git a/src/main/java/com/siot/IamportRestClient/request/ExtraRequesterEntry.java b/src/main/java/com/siot/IamportRestClient/request/ExtraRequesterEntry.java
@@ -0,0 +1,17 @@
+package com.siot.IamportRestClient.request;
+
+import com.google.gson.annotations.SerializedName;
+
+public class ExtraRequesterEntry {
+
+    @SerializedName("requester")
+    private String requester;
+
+    public ExtraRequesterEntry(String requester) {
+        this.requester = requester;
+    }
+
+    public String getRequester() {
+        return requester;
+    }
+}