From fd9d82b06199762356647da44a8ca4e28612af68 Mon Sep 17 00:00:00 2001 From: "kardelen.yonten" Date: Wed, 3 Jun 2026 16:51:45 +0300 Subject: [PATCH 1/2] Add mass payout sample implementations --- src/main/java/com/iyzipay/model/Amount.java | 32 +++++ .../com/iyzipay/model/InvalidOrderVo.java | 31 +++++ src/main/java/com/iyzipay/model/ItemType.java | 5 + .../com/iyzipay/model/MassPayoutItem.java | 72 +++++++++++ .../model/MassPayoutOrderRetrieveVo.java | 114 ++++++++++++++++++ .../iyzipay/model/MassPayoutRetrieveVo.java | 96 +++++++++++++++ .../com/iyzipay/model/MassPayoutStatus.java | 22 ++++ .../java/com/iyzipay/model/OrderStatus.java | 23 ++++ src/main/java/com/iyzipay/model/PageDto.java | 57 +++++++++ .../model/masspayout/MassPayoutAuth.java | 19 +++ .../masspayout/MassPayoutBalanceRetrieve.java | 29 +++++ .../model/masspayout/MassPayoutCancel.java | 18 +++ .../model/masspayout/MassPayoutInit.java | 41 +++++++ .../masspayout/MassPayoutOrderRetrieve.java | 28 +++++ .../model/masspayout/MassPayoutRetrieve.java | 41 +++++++ .../masspayout/MassPayoutAuthRequest.java | 22 ++++ .../masspayout/MassPayoutInitRequest.java | 46 +++++++ .../masspayout/MassPayoutRetrieveRequest.java | 64 ++++++++++ .../masspayout/MassPayoutAuthSample.java | 27 +++++ .../masspayout/MassPayoutCancelSample.java | 21 ++++ .../masspayout/MassPayoutInitSample.java | 61 ++++++++++ .../MassPayoutOrderRetrieveSample.java | 27 +++++ .../MassPayoutRetrieveBalanceSample.java | 22 ++++ .../masspayout/MassPayoutRetrieveSample.java | 31 +++++ 24 files changed, 949 insertions(+) create mode 100644 src/main/java/com/iyzipay/model/Amount.java create mode 100644 src/main/java/com/iyzipay/model/InvalidOrderVo.java create mode 100644 src/main/java/com/iyzipay/model/ItemType.java create mode 100644 src/main/java/com/iyzipay/model/MassPayoutItem.java create mode 100644 src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java create mode 100644 src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java create mode 100644 src/main/java/com/iyzipay/model/MassPayoutStatus.java create mode 100644 src/main/java/com/iyzipay/model/OrderStatus.java create mode 100644 src/main/java/com/iyzipay/model/PageDto.java create mode 100644 src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java create mode 100644 src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java create mode 100644 src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java create mode 100644 src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java create mode 100644 src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java create mode 100644 src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java create mode 100644 src/main/java/com/iyzipay/request/masspayout/MassPayoutAuthRequest.java create mode 100644 src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java create mode 100644 src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java create mode 100644 src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java create mode 100644 src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java create mode 100644 src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java create mode 100644 src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java create mode 100644 src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java create mode 100644 src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java diff --git a/src/main/java/com/iyzipay/model/Amount.java b/src/main/java/com/iyzipay/model/Amount.java new file mode 100644 index 0000000..f1fde4a --- /dev/null +++ b/src/main/java/com/iyzipay/model/Amount.java @@ -0,0 +1,32 @@ +package com.iyzipay.model; + +import java.math.BigDecimal; + +public class Amount { + private BigDecimal value; + private String currency; + + public BigDecimal getValue() { + return value; + } + + public void setValue(BigDecimal value) { + this.value = value; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + @Override + public String toString() { + return "Amount{" + + "value=" + value + + ", currency='" + currency + '\'' + + '}'; + } +} diff --git a/src/main/java/com/iyzipay/model/InvalidOrderVo.java b/src/main/java/com/iyzipay/model/InvalidOrderVo.java new file mode 100644 index 0000000..6e87800 --- /dev/null +++ b/src/main/java/com/iyzipay/model/InvalidOrderVo.java @@ -0,0 +1,31 @@ +package com.iyzipay.model; + +public class InvalidOrderVo { + private String externalId; + private String errorCode; + private String errorMessage; + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } + + public String getErrorCode() { + return errorCode; + } + + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } +} diff --git a/src/main/java/com/iyzipay/model/ItemType.java b/src/main/java/com/iyzipay/model/ItemType.java new file mode 100644 index 0000000..e8a9f85 --- /dev/null +++ b/src/main/java/com/iyzipay/model/ItemType.java @@ -0,0 +1,5 @@ +package com.iyzipay.model; + +public enum ItemType { + INVALID, VALID +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/MassPayoutItem.java b/src/main/java/com/iyzipay/model/MassPayoutItem.java new file mode 100644 index 0000000..0b62ee5 --- /dev/null +++ b/src/main/java/com/iyzipay/model/MassPayoutItem.java @@ -0,0 +1,72 @@ +package com.iyzipay.model; + +import java.io.Serializable; + +public class MassPayoutItem implements Serializable { + private String itemExternalId; + private String recipientType; + private String recipientInfo; + private Amount amount; + private String description; + private String recipientName; + + public String getItemExternalId() { + return itemExternalId; + } + + public void setItemExternalId(String itemExternalId) { + this.itemExternalId = itemExternalId; + } + + public String getRecipientType() { + return recipientType; + } + + public void setRecipientType(String recipientType) { + this.recipientType = recipientType; + } + + public String getRecipientInfo() { + return recipientInfo; + } + + public void setRecipientInfo(String recipientInfo) { + this.recipientInfo = recipientInfo; + } + + public Amount getAmount() { + return amount; + } + + public void setAmount(Amount amount) { + this.amount = amount; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getRecipientName() { + return recipientName; + } + + public void setRecipientName(String recipientName) { + this.recipientName = recipientName; + } + + @Override + public String toString() { + return "MassPayoutItem{" + + "itemExternalId='" + itemExternalId + '\'' + + ", recipientType='" + recipientType + '\'' + + ", recipientInfo='" + recipientInfo + '\'' + + ", amount=" + amount + + ", description='" + description + '\'' + + ", recipientName='" + recipientName + '\'' + + '}'; + } +} diff --git a/src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java b/src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java new file mode 100644 index 0000000..7dc9588 --- /dev/null +++ b/src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java @@ -0,0 +1,114 @@ +package com.iyzipay.model; + +import java.math.BigDecimal; + +public class MassPayoutOrderRetrieveVo { + private String itemExternalId; + private String referenceCode; + private String recipientType; + private String recipientName; + private String recipientInfo; + private String description; + private OrderStatus itemStatus; + private String errorMessage; + private BigDecimal totalAmount; + private BigDecimal commissionAmount; + private String currencyCode; + private String massPayoutRequestId; + + public String getItemExternalId() { + return itemExternalId; + } + + public void setItemExternalId(String itemExternalId) { + this.itemExternalId = itemExternalId; + } + + public String getReferenceCode() { + return referenceCode; + } + + public void setReferenceCode(String referenceCode) { + this.referenceCode = referenceCode; + } + + public String getRecipientType() { + return recipientType; + } + + public void setRecipientType(String recipientType) { + this.recipientType = recipientType; + } + + public String getRecipientName() { + return recipientName; + } + + public void setRecipientName(String recipientName) { + this.recipientName = recipientName; + } + + public String getRecipientInfo() { + return recipientInfo; + } + + public void setRecipientInfo(String recipientInfo) { + this.recipientInfo = recipientInfo; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public OrderStatus getItemStatus() { + return itemStatus; + } + + public void setItemStatus(OrderStatus itemStatus) { + this.itemStatus = itemStatus; + } + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + + public BigDecimal getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + public BigDecimal getCommissionAmount() { + return commissionAmount; + } + + public void setCommissionAmount(BigDecimal commissionAmount) { + this.commissionAmount = commissionAmount; + } + + public String getCurrencyCode() { + return currencyCode; + } + + public void setCurrencyCode(String currencyCode) { + this.currencyCode = currencyCode; + } + + public String getMassPayoutRequestId() { + return massPayoutRequestId; + } + + public void setMassPayoutRequestId(String massPayoutRequestId) { + this.massPayoutRequestId = massPayoutRequestId; + } +} diff --git a/src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java b/src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java new file mode 100644 index 0000000..71b1d62 --- /dev/null +++ b/src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java @@ -0,0 +1,96 @@ +package com.iyzipay.model; + +import java.math.BigDecimal; + +public class MassPayoutRetrieveVo { + private String externalId; + private Long merchantId; + private BigDecimal totalAmount; + private BigDecimal totalSuccessfulAmount; + private MassPayoutStatus massPayoutStatus; + private String receivedDate; + private String completedDate; + private String canceledDate; + private BigDecimal totalCommissionAmount; + private String currency; + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } + + public Long getMerchantId() { + return merchantId; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } + + public BigDecimal getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + public BigDecimal getTotalSuccessfulAmount() { + return totalSuccessfulAmount; + } + + public void setTotalSuccessfulAmount(BigDecimal totalSuccessfulAmount) { + this.totalSuccessfulAmount = totalSuccessfulAmount; + } + + public MassPayoutStatus getMassPayoutStatus() { + return massPayoutStatus; + } + + public void setMassPayoutStatus(MassPayoutStatus massPayoutStatus) { + this.massPayoutStatus = massPayoutStatus; + } + + public String getReceivedDate() { + return receivedDate; + } + + public void setReceivedDate(String receivedDate) { + this.receivedDate = receivedDate; + } + + public String getCompletedDate() { + return completedDate; + } + + public void setCompletedDate(String completedDate) { + this.completedDate = completedDate; + } + + public String getCanceledDate() { + return canceledDate; + } + + public void setCanceledDate(String canceledDate) { + this.canceledDate = canceledDate; + } + + public BigDecimal getTotalCommissionAmount() { + return totalCommissionAmount; + } + + public void setTotalCommissionAmount(BigDecimal totalCommissionAmount) { + this.totalCommissionAmount = totalCommissionAmount; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } +} diff --git a/src/main/java/com/iyzipay/model/MassPayoutStatus.java b/src/main/java/com/iyzipay/model/MassPayoutStatus.java new file mode 100644 index 0000000..7c70cb9 --- /dev/null +++ b/src/main/java/com/iyzipay/model/MassPayoutStatus.java @@ -0,0 +1,22 @@ +package com.iyzipay.model; + +public enum MassPayoutStatus { + INIT(1), + IN_PROGRESS(2), + SUCCESS(3), + COMPLETED(5), + FAIL(-1), + INSUFFICIENT_BALANCE(-2), + CANCELED(-3), + IYZICO_INSUFFICIENT_BALANCE(-4); + + private final Integer value; + + MassPayoutStatus(Integer value) { + this.value = value; + } + + public Integer getValue() { + return value; + } +} diff --git a/src/main/java/com/iyzipay/model/OrderStatus.java b/src/main/java/com/iyzipay/model/OrderStatus.java new file mode 100644 index 0000000..26d7041 --- /dev/null +++ b/src/main/java/com/iyzipay/model/OrderStatus.java @@ -0,0 +1,23 @@ +package com.iyzipay.model; + +public enum OrderStatus { + INVALID(-2), + FAILED(-1), + SUCCESS(1), + INIT(2), + PROCESSING(3), + MASS_PAYOUT_CANCELED(5), + QUEUED(6), + DEPOSIT_SUCCESS(7), + DEPOSIT_FAIL(8); + + private final Integer value; + + OrderStatus(Integer value) { + this.value = value; + } + + public Integer getValue() { + return value; + } +} diff --git a/src/main/java/com/iyzipay/model/PageDto.java b/src/main/java/com/iyzipay/model/PageDto.java new file mode 100644 index 0000000..783b71a --- /dev/null +++ b/src/main/java/com/iyzipay/model/PageDto.java @@ -0,0 +1,57 @@ +package com.iyzipay.model; + +import java.util.List; + +public class PageDto { + + private List items; + private int page; + private int size; + private long total; + + public PageDto() { + } + + public PageDto(List items, int page, int size, long total) { + this.items = items; + this.page = page; + this.size = size; + this.total = total; + } + + public static PageDto of(List items, int page, int size, long total) { + return new PageDto<>(items, page, size, total); + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public long getTotal() { + return total; + } + + public void setTotal(long total) { + this.total = total; + } +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java new file mode 100644 index 0000000..4afc2f4 --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java @@ -0,0 +1,19 @@ +package com.iyzipay.model.masspayout; + +import com.iyzipay.HttpClient; +import com.iyzipay.IyzipayResource; +import com.iyzipay.Options; +import com.iyzipay.request.masspayout.MassPayoutAuthRequest; + +public class MassPayoutAuth extends IyzipayResource { + + public static MassPayoutAuth auth(MassPayoutAuthRequest request, Options options) { + String path = "/v1/mass/payout/auth"; + String uri = options.getBaseUrl() + path; + return HttpClient.create().post(uri, + getHttpProxy(options), + getHttpHeadersV2("/v1/mass/payout/auth", request, options), + request, + MassPayoutAuth.class); + } +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java new file mode 100644 index 0000000..42f9acc --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java @@ -0,0 +1,29 @@ +package com.iyzipay.model.masspayout; + +import com.iyzipay.HttpClient; +import com.iyzipay.IyzipayResource; +import com.iyzipay.Options; + +import java.math.BigDecimal; + +public class MassPayoutBalanceRetrieve extends IyzipayResource { + private BigDecimal balance; + + public static MassPayoutBalanceRetrieve retrieve(Options options) { + String path = "/v1/mass/payout/balance"; + String uri = options.getBaseUrl() + path; + return HttpClient.create().get(uri, + getHttpProxy(options), + getHttpHeadersV2("/v1/mass/payout/balance", null, options), + null, + MassPayoutBalanceRetrieve.class); + } + + public BigDecimal getBalance() { + return balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java new file mode 100644 index 0000000..60ad635 --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java @@ -0,0 +1,18 @@ +package com.iyzipay.model.masspayout; + +import com.iyzipay.HttpClient; +import com.iyzipay.IyzipayResource; +import com.iyzipay.Options; + +public class MassPayoutCancel extends IyzipayResource { + + public static MassPayoutCancel cancel(String requestId, Options options) { + String path = "/v1/mass/payout/cancel/" + requestId; + String uri = options.getBaseUrl() + path; + return HttpClient.create().post(uri, + getHttpProxy(options), + getHttpHeadersV2("/v1/mass/payout/cancel/" + requestId, null, options), + null, + MassPayoutCancel.class); + } +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java new file mode 100644 index 0000000..b7db6dd --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java @@ -0,0 +1,41 @@ +package com.iyzipay.model.masspayout; + +import com.iyzipay.HttpClient; +import com.iyzipay.IyzipayResource; +import com.iyzipay.Options; +import com.iyzipay.model.InvalidOrderVo; +import com.iyzipay.request.masspayout.MassPayoutInitRequest; + +import java.util.List; + +public class MassPayoutInit extends IyzipayResource { + + private String requestId; + private List invalidItems; + + public static MassPayoutInit init(MassPayoutInitRequest request, Options options) { + String path = "/v1/mass/payout/init"; + String uri = options.getBaseUrl() + path; + return HttpClient.create().post(uri, + getHttpProxy(options), + getHttpHeadersV2("/v1/mass/payout/init", request, options), + request, + MassPayoutInit.class); + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public List getInvalidItems() { + return invalidItems; + } + + public void setInvalidItems(List invalidItems) { + this.invalidItems = invalidItems; + } +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java new file mode 100644 index 0000000..78c3beb --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java @@ -0,0 +1,28 @@ +package com.iyzipay.model.masspayout; + +import com.iyzipay.HttpClient; +import com.iyzipay.IyzipayResource; +import com.iyzipay.Options; +import com.iyzipay.model.MassPayoutOrderRetrieveVo; + +public class MassPayoutOrderRetrieve extends IyzipayResource { + private MassPayoutOrderRetrieveVo item; + + public static MassPayoutOrderRetrieve retrieve(String referenceCode, Options options) { + String path = "/v1/mass/payout/retrieve/items/" + referenceCode; + String uri = options.getBaseUrl() + path; + return HttpClient.create().get(uri, + getHttpProxy(options), + getHttpHeadersV2("/v1/mass/payout/retrieve/items/" + referenceCode , null, options), + null, + MassPayoutOrderRetrieve.class); + } + + public MassPayoutOrderRetrieveVo getItem() { + return item; + } + + public void setItem(MassPayoutOrderRetrieveVo item) { + this.item = item; + } +} diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java new file mode 100644 index 0000000..8e325d7 --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java @@ -0,0 +1,41 @@ +package com.iyzipay.model.masspayout; + +import com.iyzipay.HttpClient; +import com.iyzipay.IyzipayResource; +import com.iyzipay.Options; +import com.iyzipay.model.MassPayoutOrderRetrieveVo; +import com.iyzipay.model.MassPayoutRetrieveVo; +import com.iyzipay.model.PageDto; +import com.iyzipay.request.masspayout.MassPayoutRetrieveRequest; + +public class MassPayoutRetrieve extends IyzipayResource { + + private MassPayoutRetrieveVo massPayout; + private PageDto massPayoutItems; + + public static MassPayoutRetrieve retrieve(MassPayoutRetrieveRequest request, Options options) { + String path = "/v1/mass/payout/retrieve"; + String uri = options.getBaseUrl() + path; + return HttpClient.create().post(uri, + getHttpProxy(options), + getHttpHeadersV2("/v1/mass/payout/retrieve", request, options), + request, + MassPayoutRetrieve.class); + } + + public MassPayoutRetrieveVo getMassPayout() { + return massPayout; + } + + public void setMassPayout(MassPayoutRetrieveVo massPayout) { + this.massPayout = massPayout; + } + + public PageDto getMassPayoutItems() { + return massPayoutItems; + } + + public void setMassPayoutItems(PageDto massPayoutItems) { + this.massPayoutItems = massPayoutItems; + } +} diff --git a/src/main/java/com/iyzipay/request/masspayout/MassPayoutAuthRequest.java b/src/main/java/com/iyzipay/request/masspayout/MassPayoutAuthRequest.java new file mode 100644 index 0000000..6ec9451 --- /dev/null +++ b/src/main/java/com/iyzipay/request/masspayout/MassPayoutAuthRequest.java @@ -0,0 +1,22 @@ +package com.iyzipay.request.masspayout; + +import com.iyzipay.Request; + +public class MassPayoutAuthRequest extends Request { + private String requestId; + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + @Override + public String toString() { + return "MassPayoutAuthRequest{" + + "requestId='" + requestId + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java b/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java new file mode 100644 index 0000000..138831b --- /dev/null +++ b/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java @@ -0,0 +1,46 @@ +package com.iyzipay.request.masspayout; + +import com.iyzipay.Request; +import com.iyzipay.model.MassPayoutItem; + +import java.util.List; + +public class MassPayoutInitRequest extends Request { + + private String externalId; + private String purpose; + private List items; + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + @Override + public String toString() { + return "MassPayoutInitRequest{" + + "externalId='" + externalId + '\'' + + ", purpose='" + purpose + '\'' + + ", items=" + items + + '}'; + } +} diff --git a/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java b/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java new file mode 100644 index 0000000..2797082 --- /dev/null +++ b/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java @@ -0,0 +1,64 @@ +package com.iyzipay.request.masspayout; + +import com.iyzipay.Request; +import com.iyzipay.model.ItemType; + +public class MassPayoutRetrieveRequest extends Request { + + private String externalMassPayoutId; + private String requestId; + private ItemType itemType; + private Integer page; + private Integer size; + + public String getExternalMassPayoutId() { + return externalMassPayoutId; + } + + public void setExternalMassPayoutId(String externalMassPayoutId) { + this.externalMassPayoutId = externalMassPayoutId; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public ItemType getItemType() { + return itemType; + } + + public void setItemType(ItemType itemType) { + this.itemType = itemType; + } + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + @Override + public String toString() { + return "MassPayoutRetrieveRequest{" + + "externalMassPayoutId='" + externalMassPayoutId + '\'' + + ", requestId='" + requestId + '\'' + + ", itemType=" + itemType + + ", page=" + page + + ", size=" + size + + '}'; + } +} diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java new file mode 100644 index 0000000..3a8d38d --- /dev/null +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java @@ -0,0 +1,27 @@ +package com.iyzipay.sample.masspayout; + +import com.iyzipay.model.Locale; +import com.iyzipay.model.Status; +import com.iyzipay.model.masspayout.MassPayoutAuth; +import com.iyzipay.request.masspayout.MassPayoutAuthRequest; +import com.iyzipay.sample.Sample; +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertTrue; + +public class MassPayoutAuthSample extends Sample { + + @Test + public void should_auth_mass_payout() { + MassPayoutAuthRequest request = new MassPayoutAuthRequest(); + request.setLocale(Locale.TR.name()); + request.setConversationId("ConversationId"); + request.setRequestId("requestId"); + + MassPayoutAuth response = MassPayoutAuth.auth(request, options); + + assertEquals(Status.SUCCESS.getValue(), response.getStatus()); + assertTrue(response.getSystemTime() > 0L); + } +} diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java new file mode 100644 index 0000000..7193934 --- /dev/null +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java @@ -0,0 +1,21 @@ +package com.iyzipay.sample.masspayout; + +import com.iyzipay.model.Status; +import com.iyzipay.model.masspayout.MassPayoutCancel; +import com.iyzipay.sample.Sample; +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertNotNull; + +public class MassPayoutCancelSample extends Sample { + + @Test + public void should_cancel_mass_payout() { + MassPayoutCancel response = MassPayoutCancel.cancel("requestId", options); + + assertNotNull(response); + System.out.println("MassPayoutInit Response: " + response); + assertEquals(Status.SUCCESS.getValue(), response.getStatus()); + } +} \ No newline at end of file diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java new file mode 100644 index 0000000..770307f --- /dev/null +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java @@ -0,0 +1,61 @@ +package com.iyzipay.sample.masspayout; + +import com.iyzipay.model.Amount; +import com.iyzipay.model.Locale; +import com.iyzipay.model.MassPayoutItem; +import com.iyzipay.model.Status; +import com.iyzipay.model.masspayout.MassPayoutInit; +import com.iyzipay.request.masspayout.MassPayoutInitRequest; +import com.iyzipay.sample.Sample; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +public class MassPayoutInitSample extends Sample { + + @Test + public void should_init_mass_payout() { + MassPayoutItem item = new MassPayoutItem(); + item.setDescription("description"); + item.setRecipientInfo("TR1234567891212"); + item.setRecipientName("John Doe"); + item.setRecipientType("IBAN"); + item.setItemExternalId("itemExternalId"); + item.setAmount(createAmount("TRY", BigDecimal.ONE)); + + List items = new ArrayList<>(); + items.add(item); + + MassPayoutInitRequest request = new MassPayoutInitRequest(); + request.setLocale(Locale.TR.name()); + request.setConversationId("123456789"); + request.setExternalId(UUID.randomUUID().toString()); + request.setPurpose("SALARY"); + request.setItems(items); + + MassPayoutInit response = MassPayoutInit.init(request, options); + + System.out.println("MassPayoutInit Response: " + response); + + assertNotNull(response); + assertEquals(Status.SUCCESS.getValue(), response.getStatus()); + assertEquals("123456789", response.getConversationId()); + assertNotNull(response.getRequestId()); + assertNotNull(response.getInvalidItems()); + assertTrue(response.getInvalidItems().isEmpty()); + } + + private Amount createAmount(String aTry, BigDecimal one) { + Amount amount = new Amount(); + amount.setCurrency(aTry); + amount.setValue(one); + return amount; + } +} diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java new file mode 100644 index 0000000..3518d1b --- /dev/null +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java @@ -0,0 +1,27 @@ +package com.iyzipay.sample.masspayout; + +import com.iyzipay.model.OrderStatus; +import com.iyzipay.model.Status; +import com.iyzipay.model.masspayout.MassPayoutOrderRetrieve; +import com.iyzipay.sample.Sample; +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; + +public class MassPayoutOrderRetrieveSample extends Sample { + + @Test + public void should_retrieve_mass_payout_order() { + MassPayoutOrderRetrieve response = MassPayoutOrderRetrieve + .retrieve("orderReferenceCode", options); + + assertEquals(Status.SUCCESS.getValue(), response.getStatus()); + assertEquals("ext-93993493", response.getItem().getItemExternalId()); + assertEquals("a5a8ab5e-771f-4edb-9370-695f77559308", response.getItem().getReferenceCode()); + assertEquals("IBAN", response.getItem().getRecipientType()); + assertEquals("Payment for services", response.getItem().getDescription()); + assertEquals(OrderStatus.INIT, response.getItem().getItemStatus()); + assertEquals("TRY", response.getItem().getCurrencyCode()); + assertEquals("4ac393f3-e917-4805-be90-f504a0e5c9a2", response.getItem().getMassPayoutRequestId()); + } +} diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java new file mode 100644 index 0000000..e5128c7 --- /dev/null +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java @@ -0,0 +1,22 @@ +package com.iyzipay.sample.masspayout; + +import com.iyzipay.model.Status; +import com.iyzipay.model.masspayout.MassPayoutBalanceRetrieve; +import com.iyzipay.sample.Sample; +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertNotNull; + +public class MassPayoutRetrieveBalanceSample extends Sample { + + @Test + public void should_retrieve_mass_payout_balance() { + MassPayoutBalanceRetrieve response = MassPayoutBalanceRetrieve.retrieve(options); + + System.out.println("MassPayoutBalanceRetrieve Response: " + response); + + assertNotNull(response); + assertEquals(Status.SUCCESS.getValue(), response.getStatus()); + } +} diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java new file mode 100644 index 0000000..605aae4 --- /dev/null +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java @@ -0,0 +1,31 @@ +package com.iyzipay.sample.masspayout; + +import com.iyzipay.model.ItemType; +import com.iyzipay.model.Locale; +import com.iyzipay.model.Status; +import com.iyzipay.model.masspayout.MassPayoutRetrieve; +import com.iyzipay.request.masspayout.MassPayoutRetrieveRequest; +import com.iyzipay.sample.Sample; +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; + +public class MassPayoutRetrieveSample extends Sample { + + @Test + public void should_retrieve_mass_payout() { + MassPayoutRetrieveRequest request = new MassPayoutRetrieveRequest(); + request.setRequestId("requestId"); + request.setLocale(Locale.TR.name()); + request.setConversationId("123456789"); + request.setSize(10); + request.setPage(0); + request.setItemType(ItemType.VALID); + + MassPayoutRetrieve response = MassPayoutRetrieve.retrieve(request, options); + + System.out.println("MassPayoutRetrieve Response: " + response); + + assertEquals(response.getStatus(), Status.SUCCESS.getValue()); + } +} From 9e1d4aab4420ecef834219501d8592adda0e4f00 Mon Sep 17 00:00:00 2001 From: "kardelen.yonten" Date: Wed, 3 Jun 2026 17:21:44 +0300 Subject: [PATCH 2/2] Refactor mass payout model structure and update package organization --- src/main/java/com/iyzipay/model/ItemType.java | 5 ----- .../java/com/iyzipay/model/{ => masspayout}/Amount.java | 2 +- .../iyzipay/model/{ => masspayout}/InvalidOrderVo.java | 2 +- .../iyzipay/model/{ => masspayout}/MassPayoutItem.java | 2 +- .../{ => masspayout}/MassPayoutOrderRetrieveVo.java | 3 ++- .../model/{ => masspayout}/MassPayoutRetrieveVo.java | 3 ++- .../java/com/iyzipay/model/{ => masspayout}/PageDto.java | 2 +- .../com/iyzipay/model/masspayout/enumtype/ItemType.java | 6 ++++++ .../{ => masspayout/enumtype}/MassPayoutStatus.java | 3 ++- .../model/{ => masspayout/enumtype}/OrderStatus.java | 3 ++- .../model/masspayout/{ => resource}/MassPayoutAuth.java | 5 +++-- .../{ => resource}/MassPayoutBalanceRetrieve.java | 5 +++-- .../masspayout/{ => resource}/MassPayoutCancel.java | 5 +++-- .../model/masspayout/{ => resource}/MassPayoutInit.java | 7 ++++--- .../{ => resource}/MassPayoutOrderRetrieve.java | 9 +++++---- .../masspayout/{ => resource}/MassPayoutRetrieve.java | 9 +++++---- .../request/masspayout/MassPayoutInitRequest.java | 2 +- .../request/masspayout/MassPayoutRetrieveRequest.java | 2 +- .../iyzipay/sample/masspayout/MassPayoutAuthSample.java | 2 +- .../sample/masspayout/MassPayoutCancelSample.java | 2 +- .../iyzipay/sample/masspayout/MassPayoutInitSample.java | 6 +++--- .../sample/masspayout/MassPayoutOrderRetrieveSample.java | 4 ++-- .../masspayout/MassPayoutRetrieveBalanceSample.java | 2 +- .../sample/masspayout/MassPayoutRetrieveSample.java | 4 ++-- 24 files changed, 53 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/com/iyzipay/model/ItemType.java rename src/main/java/com/iyzipay/model/{ => masspayout}/Amount.java (94%) rename src/main/java/com/iyzipay/model/{ => masspayout}/InvalidOrderVo.java (94%) rename src/main/java/com/iyzipay/model/{ => masspayout}/MassPayoutItem.java (97%) rename src/main/java/com/iyzipay/model/{ => masspayout}/MassPayoutOrderRetrieveVo.java (96%) rename src/main/java/com/iyzipay/model/{ => masspayout}/MassPayoutRetrieveVo.java (95%) rename src/main/java/com/iyzipay/model/{ => masspayout}/PageDto.java (96%) create mode 100644 src/main/java/com/iyzipay/model/masspayout/enumtype/ItemType.java rename src/main/java/com/iyzipay/model/{ => masspayout/enumtype}/MassPayoutStatus.java (88%) rename src/main/java/com/iyzipay/model/{ => masspayout/enumtype}/OrderStatus.java (88%) rename src/main/java/com/iyzipay/model/masspayout/{ => resource}/MassPayoutAuth.java (92%) rename src/main/java/com/iyzipay/model/masspayout/{ => resource}/MassPayoutBalanceRetrieve.java (94%) rename src/main/java/com/iyzipay/model/masspayout/{ => resource}/MassPayoutCancel.java (92%) rename src/main/java/com/iyzipay/model/masspayout/{ => resource}/MassPayoutInit.java (91%) rename src/main/java/com/iyzipay/model/masspayout/{ => resource}/MassPayoutOrderRetrieve.java (80%) rename src/main/java/com/iyzipay/model/masspayout/{ => resource}/MassPayoutRetrieve.java (85%) diff --git a/src/main/java/com/iyzipay/model/ItemType.java b/src/main/java/com/iyzipay/model/ItemType.java deleted file mode 100644 index e8a9f85..0000000 --- a/src/main/java/com/iyzipay/model/ItemType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iyzipay.model; - -public enum ItemType { - INVALID, VALID -} \ No newline at end of file diff --git a/src/main/java/com/iyzipay/model/Amount.java b/src/main/java/com/iyzipay/model/masspayout/Amount.java similarity index 94% rename from src/main/java/com/iyzipay/model/Amount.java rename to src/main/java/com/iyzipay/model/masspayout/Amount.java index f1fde4a..b80afdf 100644 --- a/src/main/java/com/iyzipay/model/Amount.java +++ b/src/main/java/com/iyzipay/model/masspayout/Amount.java @@ -1,4 +1,4 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout; import java.math.BigDecimal; diff --git a/src/main/java/com/iyzipay/model/InvalidOrderVo.java b/src/main/java/com/iyzipay/model/masspayout/InvalidOrderVo.java similarity index 94% rename from src/main/java/com/iyzipay/model/InvalidOrderVo.java rename to src/main/java/com/iyzipay/model/masspayout/InvalidOrderVo.java index 6e87800..19008b1 100644 --- a/src/main/java/com/iyzipay/model/InvalidOrderVo.java +++ b/src/main/java/com/iyzipay/model/masspayout/InvalidOrderVo.java @@ -1,4 +1,4 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout; public class InvalidOrderVo { private String externalId; diff --git a/src/main/java/com/iyzipay/model/MassPayoutItem.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutItem.java similarity index 97% rename from src/main/java/com/iyzipay/model/MassPayoutItem.java rename to src/main/java/com/iyzipay/model/masspayout/MassPayoutItem.java index 0b62ee5..e0dd294 100644 --- a/src/main/java/com/iyzipay/model/MassPayoutItem.java +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutItem.java @@ -1,4 +1,4 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout; import java.io.Serializable; diff --git a/src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieveVo.java similarity index 96% rename from src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java rename to src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieveVo.java index 7dc9588..02e42d5 100644 --- a/src/main/java/com/iyzipay/model/MassPayoutOrderRetrieveVo.java +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieveVo.java @@ -1,5 +1,6 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout; +import com.iyzipay.model.masspayout.enumtype.OrderStatus; import java.math.BigDecimal; public class MassPayoutOrderRetrieveVo { diff --git a/src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java b/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieveVo.java similarity index 95% rename from src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java rename to src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieveVo.java index 71b1d62..2e25806 100644 --- a/src/main/java/com/iyzipay/model/MassPayoutRetrieveVo.java +++ b/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieveVo.java @@ -1,5 +1,6 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout; +import com.iyzipay.model.masspayout.enumtype.MassPayoutStatus; import java.math.BigDecimal; public class MassPayoutRetrieveVo { diff --git a/src/main/java/com/iyzipay/model/PageDto.java b/src/main/java/com/iyzipay/model/masspayout/PageDto.java similarity index 96% rename from src/main/java/com/iyzipay/model/PageDto.java rename to src/main/java/com/iyzipay/model/masspayout/PageDto.java index 783b71a..4328b89 100644 --- a/src/main/java/com/iyzipay/model/PageDto.java +++ b/src/main/java/com/iyzipay/model/masspayout/PageDto.java @@ -1,4 +1,4 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout; import java.util.List; diff --git a/src/main/java/com/iyzipay/model/masspayout/enumtype/ItemType.java b/src/main/java/com/iyzipay/model/masspayout/enumtype/ItemType.java new file mode 100644 index 0000000..895ce9e --- /dev/null +++ b/src/main/java/com/iyzipay/model/masspayout/enumtype/ItemType.java @@ -0,0 +1,6 @@ +package com.iyzipay.model.masspayout.enumtype; + +public enum ItemType { + INVALID, VALID +} + diff --git a/src/main/java/com/iyzipay/model/MassPayoutStatus.java b/src/main/java/com/iyzipay/model/masspayout/enumtype/MassPayoutStatus.java similarity index 88% rename from src/main/java/com/iyzipay/model/MassPayoutStatus.java rename to src/main/java/com/iyzipay/model/masspayout/enumtype/MassPayoutStatus.java index 7c70cb9..a99a89d 100644 --- a/src/main/java/com/iyzipay/model/MassPayoutStatus.java +++ b/src/main/java/com/iyzipay/model/masspayout/enumtype/MassPayoutStatus.java @@ -1,4 +1,4 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout.enumtype; public enum MassPayoutStatus { INIT(1), @@ -20,3 +20,4 @@ public Integer getValue() { return value; } } + diff --git a/src/main/java/com/iyzipay/model/OrderStatus.java b/src/main/java/com/iyzipay/model/masspayout/enumtype/OrderStatus.java similarity index 88% rename from src/main/java/com/iyzipay/model/OrderStatus.java rename to src/main/java/com/iyzipay/model/masspayout/enumtype/OrderStatus.java index 26d7041..80c7435 100644 --- a/src/main/java/com/iyzipay/model/OrderStatus.java +++ b/src/main/java/com/iyzipay/model/masspayout/enumtype/OrderStatus.java @@ -1,4 +1,4 @@ -package com.iyzipay.model; +package com.iyzipay.model.masspayout.enumtype; public enum OrderStatus { INVALID(-2), @@ -21,3 +21,4 @@ public Integer getValue() { return value; } } + diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutAuth.java similarity index 92% rename from src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java rename to src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutAuth.java index 4afc2f4..ec4ccd2 100644 --- a/src/main/java/com/iyzipay/model/masspayout/MassPayoutAuth.java +++ b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutAuth.java @@ -1,4 +1,4 @@ -package com.iyzipay.model.masspayout; +package com.iyzipay.model.masspayout.resource; import com.iyzipay.HttpClient; import com.iyzipay.IyzipayResource; @@ -16,4 +16,5 @@ public static MassPayoutAuth auth(MassPayoutAuthRequest request, Options options request, MassPayoutAuth.class); } -} \ No newline at end of file +} + diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutBalanceRetrieve.java similarity index 94% rename from src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java rename to src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutBalanceRetrieve.java index 42f9acc..5ccbf6d 100644 --- a/src/main/java/com/iyzipay/model/masspayout/MassPayoutBalanceRetrieve.java +++ b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutBalanceRetrieve.java @@ -1,4 +1,4 @@ -package com.iyzipay.model.masspayout; +package com.iyzipay.model.masspayout.resource; import com.iyzipay.HttpClient; import com.iyzipay.IyzipayResource; @@ -26,4 +26,5 @@ public BigDecimal getBalance() { public void setBalance(BigDecimal balance) { this.balance = balance; } -} \ No newline at end of file +} + diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutCancel.java similarity index 92% rename from src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java rename to src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutCancel.java index 60ad635..965465d 100644 --- a/src/main/java/com/iyzipay/model/masspayout/MassPayoutCancel.java +++ b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutCancel.java @@ -1,4 +1,4 @@ -package com.iyzipay.model.masspayout; +package com.iyzipay.model.masspayout.resource; import com.iyzipay.HttpClient; import com.iyzipay.IyzipayResource; @@ -15,4 +15,5 @@ public static MassPayoutCancel cancel(String requestId, Options options) { null, MassPayoutCancel.class); } -} \ No newline at end of file +} + diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutInit.java similarity index 91% rename from src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java rename to src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutInit.java index b7db6dd..9820887 100644 --- a/src/main/java/com/iyzipay/model/masspayout/MassPayoutInit.java +++ b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutInit.java @@ -1,9 +1,9 @@ -package com.iyzipay.model.masspayout; +package com.iyzipay.model.masspayout.resource; import com.iyzipay.HttpClient; import com.iyzipay.IyzipayResource; import com.iyzipay.Options; -import com.iyzipay.model.InvalidOrderVo; +import com.iyzipay.model.masspayout.InvalidOrderVo; import com.iyzipay.request.masspayout.MassPayoutInitRequest; import java.util.List; @@ -38,4 +38,5 @@ public List getInvalidItems() { public void setInvalidItems(List invalidItems) { this.invalidItems = invalidItems; } -} \ No newline at end of file +} + diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutOrderRetrieve.java similarity index 80% rename from src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java rename to src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutOrderRetrieve.java index 78c3beb..f8488d1 100644 --- a/src/main/java/com/iyzipay/model/masspayout/MassPayoutOrderRetrieve.java +++ b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutOrderRetrieve.java @@ -1,9 +1,9 @@ -package com.iyzipay.model.masspayout; +package com.iyzipay.model.masspayout.resource; import com.iyzipay.HttpClient; import com.iyzipay.IyzipayResource; import com.iyzipay.Options; -import com.iyzipay.model.MassPayoutOrderRetrieveVo; +import com.iyzipay.model.masspayout.MassPayoutOrderRetrieveVo; public class MassPayoutOrderRetrieve extends IyzipayResource { private MassPayoutOrderRetrieveVo item; @@ -11,9 +11,9 @@ public class MassPayoutOrderRetrieve extends IyzipayResource { public static MassPayoutOrderRetrieve retrieve(String referenceCode, Options options) { String path = "/v1/mass/payout/retrieve/items/" + referenceCode; String uri = options.getBaseUrl() + path; - return HttpClient.create().get(uri, + return HttpClient.create().get(uri, getHttpProxy(options), - getHttpHeadersV2("/v1/mass/payout/retrieve/items/" + referenceCode , null, options), + getHttpHeadersV2("/v1/mass/payout/retrieve/items/" + referenceCode, null, options), null, MassPayoutOrderRetrieve.class); } @@ -26,3 +26,4 @@ public void setItem(MassPayoutOrderRetrieveVo item) { this.item = item; } } + diff --git a/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutRetrieve.java similarity index 85% rename from src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java rename to src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutRetrieve.java index 8e325d7..6ace053 100644 --- a/src/main/java/com/iyzipay/model/masspayout/MassPayoutRetrieve.java +++ b/src/main/java/com/iyzipay/model/masspayout/resource/MassPayoutRetrieve.java @@ -1,11 +1,11 @@ -package com.iyzipay.model.masspayout; +package com.iyzipay.model.masspayout.resource; import com.iyzipay.HttpClient; import com.iyzipay.IyzipayResource; import com.iyzipay.Options; -import com.iyzipay.model.MassPayoutOrderRetrieveVo; -import com.iyzipay.model.MassPayoutRetrieveVo; -import com.iyzipay.model.PageDto; +import com.iyzipay.model.masspayout.MassPayoutOrderRetrieveVo; +import com.iyzipay.model.masspayout.MassPayoutRetrieveVo; +import com.iyzipay.model.masspayout.PageDto; import com.iyzipay.request.masspayout.MassPayoutRetrieveRequest; public class MassPayoutRetrieve extends IyzipayResource { @@ -39,3 +39,4 @@ public void setMassPayoutItems(PageDto massPayoutItem this.massPayoutItems = massPayoutItems; } } + diff --git a/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java b/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java index 138831b..1eb0491 100644 --- a/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java +++ b/src/main/java/com/iyzipay/request/masspayout/MassPayoutInitRequest.java @@ -1,7 +1,7 @@ package com.iyzipay.request.masspayout; import com.iyzipay.Request; -import com.iyzipay.model.MassPayoutItem; +import com.iyzipay.model.masspayout.MassPayoutItem; import java.util.List; diff --git a/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java b/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java index 2797082..9af3f47 100644 --- a/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java +++ b/src/main/java/com/iyzipay/request/masspayout/MassPayoutRetrieveRequest.java @@ -1,7 +1,7 @@ package com.iyzipay.request.masspayout; import com.iyzipay.Request; -import com.iyzipay.model.ItemType; +import com.iyzipay.model.masspayout.enumtype.ItemType; public class MassPayoutRetrieveRequest extends Request { diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java index 3a8d38d..0d45764 100644 --- a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutAuthSample.java @@ -2,7 +2,7 @@ import com.iyzipay.model.Locale; import com.iyzipay.model.Status; -import com.iyzipay.model.masspayout.MassPayoutAuth; +import com.iyzipay.model.masspayout.resource.MassPayoutAuth; import com.iyzipay.request.masspayout.MassPayoutAuthRequest; import com.iyzipay.sample.Sample; import org.junit.Test; diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java index 7193934..3d79274 100644 --- a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutCancelSample.java @@ -1,7 +1,7 @@ package com.iyzipay.sample.masspayout; import com.iyzipay.model.Status; -import com.iyzipay.model.masspayout.MassPayoutCancel; +import com.iyzipay.model.masspayout.resource.MassPayoutCancel; import com.iyzipay.sample.Sample; import org.junit.Test; diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java index 770307f..973b928 100644 --- a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutInitSample.java @@ -1,10 +1,10 @@ package com.iyzipay.sample.masspayout; -import com.iyzipay.model.Amount; +import com.iyzipay.model.masspayout.Amount; import com.iyzipay.model.Locale; -import com.iyzipay.model.MassPayoutItem; +import com.iyzipay.model.masspayout.MassPayoutItem; import com.iyzipay.model.Status; -import com.iyzipay.model.masspayout.MassPayoutInit; +import com.iyzipay.model.masspayout.resource.MassPayoutInit; import com.iyzipay.request.masspayout.MassPayoutInitRequest; import com.iyzipay.sample.Sample; import org.junit.Test; diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java index 3518d1b..0f66219 100644 --- a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutOrderRetrieveSample.java @@ -1,8 +1,8 @@ package com.iyzipay.sample.masspayout; -import com.iyzipay.model.OrderStatus; +import com.iyzipay.model.masspayout.enumtype.OrderStatus; import com.iyzipay.model.Status; -import com.iyzipay.model.masspayout.MassPayoutOrderRetrieve; +import com.iyzipay.model.masspayout.resource.MassPayoutOrderRetrieve; import com.iyzipay.sample.Sample; import org.junit.Test; diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java index e5128c7..3d2d529 100644 --- a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveBalanceSample.java @@ -1,7 +1,7 @@ package com.iyzipay.sample.masspayout; import com.iyzipay.model.Status; -import com.iyzipay.model.masspayout.MassPayoutBalanceRetrieve; +import com.iyzipay.model.masspayout.resource.MassPayoutBalanceRetrieve; import com.iyzipay.sample.Sample; import org.junit.Test; diff --git a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java index 605aae4..4c389b4 100644 --- a/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java +++ b/src/test/java/com/iyzipay/sample/masspayout/MassPayoutRetrieveSample.java @@ -1,9 +1,9 @@ package com.iyzipay.sample.masspayout; -import com.iyzipay.model.ItemType; +import com.iyzipay.model.masspayout.enumtype.ItemType; import com.iyzipay.model.Locale; import com.iyzipay.model.Status; -import com.iyzipay.model.masspayout.MassPayoutRetrieve; +import com.iyzipay.model.masspayout.resource.MassPayoutRetrieve; import com.iyzipay.request.masspayout.MassPayoutRetrieveRequest; import com.iyzipay.sample.Sample; import org.junit.Test;