From 8590fc759d456616dd7da4115a2c2bd87fdc7042 Mon Sep 17 00:00:00 2001 From: Alawn Date: Tue, 16 May 2023 16:17:49 +0800 Subject: [PATCH] Hello World --- .../ecp/payment/controller/OrderController.java | 2 +- .../murong/ecp/payment/domain/ConsumeOrder.java | 1 + .../ecp/payment/domain/paytool/AwardPoint.java | 13 +++++++++++++ .../ecp/payment/domain/paytool/BankCard.java | 14 ++++++++++++++ .../payment/domain/{ => paytool}/PaymentTool.java | 5 ++++- .../murong/ecp/payment/domain/paytool/Wallet.java | 14 ++++++++++++++ 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/murong/ecp/payment/domain/paytool/AwardPoint.java create mode 100644 src/main/java/com/murong/ecp/payment/domain/paytool/BankCard.java rename src/main/java/com/murong/ecp/payment/domain/{ => paytool}/PaymentTool.java (89%) create mode 100644 src/main/java/com/murong/ecp/payment/domain/paytool/Wallet.java diff --git a/src/main/java/com/murong/ecp/payment/controller/OrderController.java b/src/main/java/com/murong/ecp/payment/controller/OrderController.java index 9915cd4..ef05837 100644 --- a/src/main/java/com/murong/ecp/payment/controller/OrderController.java +++ b/src/main/java/com/murong/ecp/payment/controller/OrderController.java @@ -4,7 +4,7 @@ import com.murong.ecp.payment.api.PayOrderRequest; import com.murong.ecp.payment.api.Payment; import com.murong.ecp.payment.api.PlaceOrderRequest; import com.murong.ecp.payment.domain.ConsumeOrder; -import com.murong.ecp.payment.domain.PaymentTool; +import com.murong.ecp.payment.domain.paytool.PaymentTool; import com.murong.ecp.payment.processor.flow.OrderNotificationProcessor; import com.murong.ecp.payment.processor.flow.OrderRiskProcessor; import com.murong.ecp.payment.processor.payment.BankCardToolProcessor; diff --git a/src/main/java/com/murong/ecp/payment/domain/ConsumeOrder.java b/src/main/java/com/murong/ecp/payment/domain/ConsumeOrder.java index 54effdb..10699aa 100644 --- a/src/main/java/com/murong/ecp/payment/domain/ConsumeOrder.java +++ b/src/main/java/com/murong/ecp/payment/domain/ConsumeOrder.java @@ -1,6 +1,7 @@ package com.murong.ecp.payment.domain; import com.murong.ecp.payment.api.PlaceOrderRequest; +import com.murong.ecp.payment.domain.paytool.PaymentTool; import com.murong.ecp.payment.enums.OrderStatus; import com.murong.ecp.payment.enums.PaymentMethod; import com.murong.ecp.payment.enums.RiskStatus; diff --git a/src/main/java/com/murong/ecp/payment/domain/paytool/AwardPoint.java b/src/main/java/com/murong/ecp/payment/domain/paytool/AwardPoint.java new file mode 100644 index 0000000..51c7aa4 --- /dev/null +++ b/src/main/java/com/murong/ecp/payment/domain/paytool/AwardPoint.java @@ -0,0 +1,13 @@ +package com.murong.ecp.payment.domain.paytool; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class AwardPoint extends PaymentTool { +} diff --git a/src/main/java/com/murong/ecp/payment/domain/paytool/BankCard.java b/src/main/java/com/murong/ecp/payment/domain/paytool/BankCard.java new file mode 100644 index 0000000..9598a12 --- /dev/null +++ b/src/main/java/com/murong/ecp/payment/domain/paytool/BankCard.java @@ -0,0 +1,14 @@ +package com.murong.ecp.payment.domain.paytool; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class BankCard extends PaymentTool { + +} diff --git a/src/main/java/com/murong/ecp/payment/domain/PaymentTool.java b/src/main/java/com/murong/ecp/payment/domain/paytool/PaymentTool.java similarity index 89% rename from src/main/java/com/murong/ecp/payment/domain/PaymentTool.java rename to src/main/java/com/murong/ecp/payment/domain/paytool/PaymentTool.java index 9c68417..6c5d28a 100644 --- a/src/main/java/com/murong/ecp/payment/domain/PaymentTool.java +++ b/src/main/java/com/murong/ecp/payment/domain/paytool/PaymentTool.java @@ -1,6 +1,9 @@ -package com.murong.ecp.payment.domain; +package com.murong.ecp.payment.domain.paytool; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.murong.ecp.payment.domain.Fee; +import com.murong.ecp.payment.domain.Money; +import com.murong.ecp.payment.domain.Tax; import com.murong.ecp.payment.enums.PaymentMethod; import com.murong.ecp.payment.enums.PaymentStatus; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/murong/ecp/payment/domain/paytool/Wallet.java b/src/main/java/com/murong/ecp/payment/domain/paytool/Wallet.java new file mode 100644 index 0000000..9ba8830 --- /dev/null +++ b/src/main/java/com/murong/ecp/payment/domain/paytool/Wallet.java @@ -0,0 +1,14 @@ +package com.murong.ecp.payment.domain.paytool; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Wallet extends PaymentTool { + +}