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 3c0acd6..cbe9dc5 100644 --- a/src/main/java/com/murong/ecp/payment/domain/ConsumeOrder.java +++ b/src/main/java/com/murong/ecp/payment/domain/ConsumeOrder.java @@ -123,7 +123,9 @@ public class ConsumeOrder extends Order { order.setMerchantId(request.getMerchantId()); return order; } - + public OrderStatus getorderStatus(){ + return orderStatus; + } public boolean isNotified(){ return this.notified; } diff --git a/src/main/java/com/murong/ecp/payment/domain/PaymentPart.java b/src/main/java/com/murong/ecp/payment/domain/PaymentPart.java index 18ec29a..a27c43b 100644 --- a/src/main/java/com/murong/ecp/payment/domain/PaymentPart.java +++ b/src/main/java/com/murong/ecp/payment/domain/PaymentPart.java @@ -2,6 +2,7 @@ package com.murong.ecp.payment.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import com.murong.ecp.payment.enums.PaymentMethod; +import com.murong.ecp.payment.enums.PaymentStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -20,6 +21,7 @@ public class PaymentPart { protected String payeeAcNo; protected String payeeAcNm; protected Money paymentPrincipal; + protected PaymentStatus paymentStatus; @JsonIgnore protected List paymentTaxs; @JsonIgnore diff --git a/src/main/java/com/murong/ecp/payment/enums/PaymentStatus.java b/src/main/java/com/murong/ecp/payment/enums/PaymentStatus.java index 7ae5624..18e79bf 100644 --- a/src/main/java/com/murong/ecp/payment/enums/PaymentStatus.java +++ b/src/main/java/com/murong/ecp/payment/enums/PaymentStatus.java @@ -1,7 +1,7 @@ package com.murong.ecp.payment.enums; public enum PaymentStatus { - INITIAL("I", "初始状态"), + UNTREATED("U", "未处理"), SUCCESS("S", "成功状态"), FAILURE("F", "失败状态"), PROCESSING("P", "处理中"); diff --git a/src/main/java/com/murong/ecp/payment/processor/ProcessorChain.java b/src/main/java/com/murong/ecp/payment/processor/ProcessorChain.java index 4470f0a..166b71b 100644 --- a/src/main/java/com/murong/ecp/payment/processor/ProcessorChain.java +++ b/src/main/java/com/murong/ecp/payment/processor/ProcessorChain.java @@ -3,5 +3,5 @@ package com.murong.ecp.payment.processor; public interface ProcessorChain { void entry(T request); void setNext(ProcessorChain next); - boolean checkParams(T request); + boolean assertParams(T request); } diff --git a/src/main/java/com/murong/ecp/payment/processor/flow/OrderDefaultProcessor.java b/src/main/java/com/murong/ecp/payment/processor/flow/OrderDefaultProcessor.java index 8b21159..70e18c9 100644 --- a/src/main/java/com/murong/ecp/payment/processor/flow/OrderDefaultProcessor.java +++ b/src/main/java/com/murong/ecp/payment/processor/flow/OrderDefaultProcessor.java @@ -12,8 +12,14 @@ public abstract class OrderDefaultProcessor implements ProcessorChain