From d9ec02b27463c46f8bdff06efd1d74055fc51073 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 16 May 2023 15:42:29 +0800
Subject: [PATCH] Hello World

---
 .../ecp/payment/domain/ConsumeOrder.java      |  4 ++-
 .../ecp/payment/domain/PaymentPart.java       |  2 ++
 .../ecp/payment/enums/PaymentStatus.java      |  2 +-
 .../ecp/payment/processor/ProcessorChain.java |  2 +-
 .../processor/flow/OrderDefaultProcessor.java | 14 ++++----
 .../flow/OrderNotificationProcessor.java      |  2 +-
 .../processor/flow/OrderRiskProcessor.java    |  2 +-
 .../payment/BankCardPaymentPartProcessor.java |  2 +-
 .../payment/PaymentPartDefaultProcessor.java  | 34 +++++++++++++++----
 .../payment/WalletPaymentPartProcessor.java   |  2 +-
 10 files changed, 47 insertions(+), 19 deletions(-)

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<Tax>   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<T> {
     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<ConsumeOrd
         log.info("DefaultProcessor.entry");
         if (next != null){
             log.info("DefaultProcessor.precheck");
-            if(!checkParams(order)) return;
+            if(!assertParams(order)) return;
             /** process */
+            try {
+                process(order);
+            }
+            catch (Throwable e) {
+               onError(order,e);
+            }
         }
         if (next != null){
             /** next flow */
@@ -23,11 +29,7 @@ public abstract class OrderDefaultProcessor implements ProcessorChain<ConsumeOrd
     }
 
     protected abstract void process(ConsumeOrder order);
-
-    public void onSuccess(ConsumeOrder order){
-    }
-    public void onFailure(ConsumeOrder order){
-    }
+    public void onError(ConsumeOrder order,Throwable e){}
     @Override
     public void setNext(ProcessorChain next){
         this.next = next;
diff --git a/src/main/java/com/murong/ecp/payment/processor/flow/OrderNotificationProcessor.java b/src/main/java/com/murong/ecp/payment/processor/flow/OrderNotificationProcessor.java
index 5b13f8d..40cd2ba 100644
--- a/src/main/java/com/murong/ecp/payment/processor/flow/OrderNotificationProcessor.java
+++ b/src/main/java/com/murong/ecp/payment/processor/flow/OrderNotificationProcessor.java
@@ -10,7 +10,7 @@ public class OrderNotificationProcessor extends OrderDefaultProcessor {
 
 
     @Override
-    public boolean checkParams(ConsumeOrder order) {
+    public boolean assertParams(ConsumeOrder order) {
         log.info("RiskProcessor.precheck");
         return !order.isNotified() && order.isFinished() ? true : false;
     }
diff --git a/src/main/java/com/murong/ecp/payment/processor/flow/OrderRiskProcessor.java b/src/main/java/com/murong/ecp/payment/processor/flow/OrderRiskProcessor.java
index d804c54..f35b342 100644
--- a/src/main/java/com/murong/ecp/payment/processor/flow/OrderRiskProcessor.java
+++ b/src/main/java/com/murong/ecp/payment/processor/flow/OrderRiskProcessor.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 public class OrderRiskProcessor extends OrderDefaultProcessor {
 
     @Override
-    public boolean checkParams(ConsumeOrder order) {
+    public boolean assertParams(ConsumeOrder order) {
         log.info("RiskProcessor.precheck");
         return !order.orderCreated() && !order.riskUntreated() ? true : false;
     }
diff --git a/src/main/java/com/murong/ecp/payment/processor/payment/BankCardPaymentPartProcessor.java b/src/main/java/com/murong/ecp/payment/processor/payment/BankCardPaymentPartProcessor.java
index f38b830..fee8ce1 100644
--- a/src/main/java/com/murong/ecp/payment/processor/payment/BankCardPaymentPartProcessor.java
+++ b/src/main/java/com/murong/ecp/payment/processor/payment/BankCardPaymentPartProcessor.java
@@ -23,7 +23,7 @@ public class BankCardPaymentPartProcessor extends PaymentPartDefaultProcessor {
     }
 
     @Override
-    public boolean checkParams(ConsumeOrder order){
+    public boolean assertParams(ConsumeOrder order){
         log.info("BankCardPaymentPartProcessor.precheck");
 //        if (order.riskPassed() && order. )
 
diff --git a/src/main/java/com/murong/ecp/payment/processor/payment/PaymentPartDefaultProcessor.java b/src/main/java/com/murong/ecp/payment/processor/payment/PaymentPartDefaultProcessor.java
index 0485f41..f8453b9 100644
--- a/src/main/java/com/murong/ecp/payment/processor/payment/PaymentPartDefaultProcessor.java
+++ b/src/main/java/com/murong/ecp/payment/processor/payment/PaymentPartDefaultProcessor.java
@@ -16,12 +16,30 @@ public abstract class PaymentPartDefaultProcessor implements ProcessorChain<Cons
     }
     public void entry(ConsumeOrder order) {
         log.info("PaymentPartProcessor.entry:{}",order);
-        if(!checkParams(order)) return;
+        if(!assertParams(order)) return;
 
         for (PaymentMethod paymentMethod:this.paymentMethods ) {
             if (order.containsPaymentMethod(paymentMethod)){
                 /** payment process */
-                process(order);
+                try {
+                    process(order);
+                    switch(order.getPaymentItem(paymentMethod).getPaymentStatus()) {
+                        case SUCCESS:
+                            onSuccess(order);
+                            break;
+                        case FAILURE:
+                            onFailure(order);
+                            break;
+                        case PROCESSING:
+                            onProcessing(order);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                catch (Throwable e) {
+                   onError(order,e);
+                }
             }
         }
         if (next != null){
@@ -34,18 +52,22 @@ public abstract class PaymentPartDefaultProcessor implements ProcessorChain<Cons
 
     protected void process(ConsumeOrder order){
         log.info("PaymentPartProcessor.orderHandling");
-
-
         /** calculate fee */
     }
 
     public void onSuccess(ConsumeOrder order){
+        /** register journal with success*/
     }
     public void onFailure(ConsumeOrder order){
+        /** register journal with failure*/
     }
+
     public void onProcessing(ConsumeOrder order){
+        /** register journal with processing*/
     }
-    public void onUntreated(ConsumeOrder order){
+
+    public void onError(ConsumeOrder order,Throwable e){
+        /** error */
     }
 
     @Override
@@ -59,7 +81,7 @@ public abstract class PaymentPartDefaultProcessor implements ProcessorChain<Cons
      * @return
      */
     @Override
-    public boolean checkParams(ConsumeOrder order){
+    public boolean assertParams(ConsumeOrder order){
         log.info("PaymentPartProcessor.precheck");
         return order.orderCreated() && order.riskPassed() ? true : false;
     }
diff --git a/src/main/java/com/murong/ecp/payment/processor/payment/WalletPaymentPartProcessor.java b/src/main/java/com/murong/ecp/payment/processor/payment/WalletPaymentPartProcessor.java
index f6810be..38beeb4 100644
--- a/src/main/java/com/murong/ecp/payment/processor/payment/WalletPaymentPartProcessor.java
+++ b/src/main/java/com/murong/ecp/payment/processor/payment/WalletPaymentPartProcessor.java
@@ -22,7 +22,7 @@ public class WalletPaymentPartProcessor extends PaymentPartDefaultProcessor {
     }
 
     @Override
-    public boolean checkParams(ConsumeOrder order){
+    public boolean assertParams(ConsumeOrder order){
         log.info("WalletPaymentPartProcessor.precheck");
         return false;
     }