From 97d547463fe34e467ffa25ac9b7fdb55e429ebb6 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Wed, 21 May 2025 15:43:38 +0200 Subject: [PATCH] Update Shopify Order model --- .../domain/api/shopify/DiscountCode.java | 12 ++++++++++++ .../business/domain/api/shopify/Order.java | 16 ++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/DiscountCode.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/DiscountCode.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/DiscountCode.java new file mode 100644 index 000000000..49add5e66 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/DiscountCode.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.business.domain.api.shopify; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +class DiscountCode{ + @JsonProperty("code") + private String code; + + public DiscountCode() {} +} \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/Order.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/Order.java index 031b8f03c..d8035d793 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/Order.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/Order.java @@ -6,6 +6,8 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import java.math.BigInteger; +import java.util.List; +import java.util.stream.Collectors; @Slf4j @Data @@ -17,10 +19,24 @@ public class Order { @JsonProperty("note") private String note; + @JsonProperty("discount_codes") + private List discountCodes; + public Order() { } public boolean hasNote() { return note != null; } + + public boolean hasDiscountCodes() { + return discountCodes != null && !discountCodes.isEmpty(); + } + + public String getDiscountCode() { + if (discountCodes != null && !discountCodes.isEmpty()) { + return discountCodes.stream().map(DiscountCode::getCode).collect(Collectors.joining(",")); + } + return null; + } }