Hello World

This commit is contained in:
Alawn
2023-07-11 10:24:58 +08:00
parent e42e68d1f8
commit bb8f6aaf44
24 changed files with 207 additions and 102 deletions
@@ -14,6 +14,5 @@ import lombok.NoArgsConstructor;
public class Payment {
private PaymentMethod paymentMethod;
private Money amount;
private String acctName;
private String acctNo;
private String token;
}
@@ -1,14 +1,19 @@
package com.murong.ecp.payment.controller;
import cn.hutool.core.date.DateUtil;
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.Money;
import com.murong.ecp.payment.domain.Payee;
import com.murong.ecp.payment.domain.Payer;
import com.murong.ecp.payment.domain.paytool.CreditCard;
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;
import com.murong.ecp.payment.processor.payment.WalletToolProcessor;
import com.murong.ecp.payment.domain.paytool.Wallet;
import com.murong.ecp.payment.processor.order.OrderNotificationProcessor;
import com.murong.ecp.payment.processor.order.OrderRiskProcessor;
import com.murong.ecp.payment.processor.tool.BankCardProcessor;
import com.murong.ecp.payment.processor.tool.WalletProcessor;
import com.murong.ecp.payment.service.ConsumeOrderRepository;
import com.murong.ecp.payment.service.MerchantService;
import lombok.extern.slf4j.Slf4j;
@@ -21,10 +26,10 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/consume")
public class OrderController {
@Autowired
WalletToolProcessor walletToolProcessor;
WalletProcessor walletProcessor;
@Autowired
BankCardToolProcessor bankCardToolProcessor;
BankCardProcessor bankCardProcessor;
@Autowired
OrderRiskProcessor orderRiskProcessor;
@@ -75,25 +80,35 @@ public class OrderController {
ConsumeOrder order = consumeOrderRepository.getOrder(orderId);
/** transform payment -> paymentTools */
for (Payment payment : request.getPayments()) {
order.addPaymentTool(PaymentTool.builder()
.payeeAcNo(merchantService.getAccountNoById(order.getMerchantId()))
.payeeAcNm(merchantService.getAccountNoById(order.getMerchantId()))
.payerAcNo(payment.getAcctNo())
.payerAcNm(payment.getAcctName())
.paymentMethod(payment.getPaymentMethod())
.paymentPrincipal(payment.getAmount())
.build());
}
CreditCard card = new CreditCard();
card.setCvv2("333");
card.setCardNo("21239012930190230");
card.setCardHolderName("Alawn");
card.setExpireDate(DateUtil.parse("20220302","yyyyMMdd"));
Payer<CreditCard> payer = new Payer<>(card);
Wallet wallet = new Wallet();
wallet.setAcctNo("2000001");
wallet.setUserNo("103910293012");
Payee<Wallet> payee = new Payee<>(wallet);
PaymentTool bankCardTool = PaymentTool.builder()
.payer(payer)
.payee(payee)
.amount(new Money("200.00"))
.build();
order.addPaymentTool(bankCardTool);
/**
* configure chain
*
* Order Risk -> Wallet Payment -> BankCard Payment -> Order Notification
*/
orderRiskProcessor.setNext(walletToolProcessor);
walletToolProcessor.setNext(bankCardToolProcessor);
bankCardToolProcessor.setNext(orderNotificationProcessor);
orderRiskProcessor.setNext(walletProcessor);
walletProcessor.setNext(bankCardProcessor);
bankCardProcessor.setNext(orderNotificationProcessor);
orderNotificationProcessor.setNext(null);
/** start chain */
@@ -18,29 +18,28 @@ import java.util.UUID;
*/
@ToString(callSuper = true)
public class ConsumeOrder extends Order {
private List<PaymentTool> paymentTools = new ArrayList<>();;
private List<PaymentTool> breakdown = new ArrayList<>();
private List<Fee> orderFees = new ArrayList<>();
private List<Tax> orderTaxes = new ArrayList<>();
private RiskStatus riskStatus = RiskStatus.UNTREATED;
private boolean notified = false;
private OrderStatus orderStatus = OrderStatus.UNTREATED;
public boolean containsPaymentMethod(PaymentMethod paymentMethod){
return paymentTools.stream().anyMatch(tool -> tool.getPaymentMethod() == paymentMethod);
return breakdown.stream().anyMatch(tool -> tool.getPaymentMethod() == paymentMethod);
}
public boolean riskPassed(){
return riskStatus != null && riskStatus.equals(RiskStatus.PASSED) ? true:false;
return riskStatus != null && riskStatus.equals(RiskStatus.PASSED);
}
public boolean riskUntreated(){
return riskStatus != null && riskStatus.equals(RiskStatus.UNTREATED) ? true:false;
return riskStatus != null && riskStatus.equals(RiskStatus.UNTREATED);
}
public boolean orderCreated(){
return orderStatus != null && orderStatus.equals(OrderStatus.INITIALIZED) ? true:false;
return orderStatus != null && orderStatus.equals(OrderStatus.INITIALIZED);
}
@@ -61,25 +60,26 @@ public class ConsumeOrder extends Order {
}
public Money total(){
Money cost = paymentTools.stream().map(PaymentTool::totalCost).reduce(Money::add).orElse(Money.zero());
Money money = paymentTools.stream().map(PaymentTool::getPaymentPrincipal).reduce(Money::add).orElse(Money.zero());
Money cost = breakdown.stream().map(PaymentTool::totalAmount).reduce(Money::add).orElse(Money.zero());
Money money = breakdown.stream().map(PaymentTool::getAmount).reduce(Money::add).orElse(Money.zero());
return cost.add(money);
}
public void addPaymentTool(PaymentTool item) {
if (paymentTools.stream().anyMatch(b -> b.getPaymentMethod() == item.getPaymentMethod())) {
if (this.breakdown.stream().anyMatch(b -> b.getPaymentMethod() == item.getPaymentMethod())) {
throw new DuplicatedPaymentMethodException("Payment method already exists in payment tools.");
}
paymentTools.add(item);
this.breakdown.add(item);
}
public PaymentTool getPaymentTool(PaymentMethod paymentMethod) {
return paymentTools == null || paymentTools.size() < 1 ? null : paymentTools.stream()
return breakdown == null || breakdown.size() < 1 ? null : breakdown.stream()
.filter(item -> item.getPaymentMethod() == paymentMethod)
.findFirst()
.orElse(null);
}
public void removePaymentTool(PaymentMethod paymentMethod) {
paymentTools.removeIf(tools -> tools.getPaymentMethod().equals(paymentMethod));
if (breakdown != null)
breakdown.removeIf(tools -> tools.getPaymentMethod().equals(paymentMethod));
}
public void addOrderFee(Fee fee) {
orderFees.add(fee);
@@ -95,7 +95,7 @@ public class ConsumeOrder extends Order {
}
public List<PaymentTool> paymentTools(){
return paymentTools;
return breakdown;
}
public List<Fee> fees(){
@@ -124,7 +124,9 @@ public class ConsumeOrder extends Order {
order.setMerchantId(request.getMerchantId());
return order;
}
public OrderStatus getorderStatus(){
public OrderStatus getOrderStatus(){
return orderStatus;
}
public boolean isNotified(){
@@ -132,7 +134,7 @@ public class ConsumeOrder extends Order {
}
public boolean isFinished(){
return orderStatus.equals(OrderStatus.FAILURE) || orderStatus.equals(OrderStatus.SUCCESS) ? true : false;
return orderStatus.equals(OrderStatus.FAILURE) || orderStatus.equals(OrderStatus.SUCCESS);
}
}
}
@@ -0,0 +1,14 @@
package com.murong.ecp.payment.domain;
public class Payee<T> {
private T credential;
public T credential(){
return credential;
}
public Payee(T credential){
this.credential = credential;
}
}
@@ -0,0 +1,12 @@
package com.murong.ecp.payment.domain;
public class Payer<T> {
private T credential;
public T credential(){
return credential;
}
public Payer(T credential){
this.credential = credential;
}
}
@@ -0,0 +1,4 @@
package com.murong.ecp.payment.domain;
public class Wallet {
}
@@ -1,13 +1,7 @@
package com.murong.ecp.payment.domain.paytool;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class AwardPoint extends PaymentTool {
public class AwardPoint{
}
@@ -1,14 +1,9 @@
package com.murong.ecp.payment.domain.paytool;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class BankCard extends PaymentTool {
public class BankCard{
protected String cardNo;
protected String cardHolderName;
}
@@ -0,0 +1,4 @@
package com.murong.ecp.payment.domain.paytool;
public class Coupon {
}
@@ -0,0 +1,13 @@
package com.murong.ecp.payment.domain.paytool;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data
public class CreditCard extends BankCard{
private String cvv2;
private Date expireDate;
}
@@ -0,0 +1,4 @@
package com.murong.ecp.payment.domain.paytool;
public class DebitCard extends BankCard{
}
@@ -1,11 +1,11 @@
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.domain.*;
import com.murong.ecp.payment.enums.FeeType;
import com.murong.ecp.payment.enums.PaymentMethod;
import com.murong.ecp.payment.enums.PaymentStatus;
import com.murong.ecp.payment.enums.TaxType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -19,40 +19,53 @@ import java.util.List;
@NoArgsConstructor
public class PaymentTool {
protected PaymentMethod paymentMethod;
protected String payerAcNo;
protected String payerAcNm;
protected String payeeAcNo;
protected String payeeAcNm;
protected Money paymentPrincipal;
protected PaymentStatus paymentStatus;
protected Payer payer;
protected Payee payee;
// protected Money netAmount;
protected Money amount; // taxes + fees +
protected PaymentStatus paymentStatus = PaymentStatus.UNTREATED;
@JsonIgnore
protected List<Tax> paymentTaxs;
protected List<Tax> taxes;
@JsonIgnore
protected List<Fee> paymentFees;
protected List<Fee> fees;
void addTax(Tax tax){
paymentTaxs.add(tax);
taxes.add(tax);
}
void addFee(Fee fee){
paymentFees.add(fee);
fees.add(fee);
}
public Tax tax(TaxType taxType){
return taxes.stream()
.filter(tax -> tax.getTaxType() == taxType)
.findFirst()
.orElse(null);
}
public Fee fee(FeeType feeType){
return fees.stream()
.filter(fee -> fee.getFeeType() == feeType)
.findFirst()
.orElse(null);
}
public List<Tax> taxes() {
return paymentTaxs;
return taxes;
}
public List<Fee> fees(){
return paymentFees;
return fees;
}
public Money totalFee() {
return paymentFees.stream().map(Fee::getMoney).reduce(Money::add).orElse(Money.zero());
return fees.stream().map(Fee::getMoney).reduce(Money::add).orElse(Money.zero());
}
public Money totalTax() {
return paymentTaxs.stream().map(Tax::getMoney).reduce(Money::add).orElse(Money.zero());
return taxes.stream().map(Tax::getMoney).reduce(Money::add).orElse(Money.zero());
}
public Money totalCost() {
public Money totalAmount() {
return totalFee().add(totalTax());
}
public Money total() {
return totalCost().add(paymentPrincipal);
}
}
@@ -0,0 +1,4 @@
package com.murong.ecp.payment.domain.paytool;
public class Voucher {
}
@@ -1,14 +1,9 @@
package com.murong.ecp.payment.domain.paytool;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class Wallet extends PaymentTool {
public class Wallet {
private String userNo;
private String acctNo;
}
@@ -7,6 +7,7 @@ public enum PaymentMethod {
BANK_TRANSFER("BANK_TRANSFER","Bank Transfer"),
PAYPAL("PAYPAL", "PayPal"),
MOMO("MOMO","MOMO"),
VOUCHER("VOUCHER","VOUCHER"),
LOOP_WALLET("LOOP_WALLET","Loop Wallet"),
LOOP_BANK("LOOP_BANK","Loop Bank");
@@ -0,0 +1,14 @@
package com.murong.ecp.payment.exception;
import com.murong.ecp.payment.enums.ResponseMessage;
public class AccountingException extends DefaultException {
public AccountingException() {
super(ResponseMessage.TRANSACTION_RESTRICTED);
}
public AccountingException(String message) {
super(ResponseMessage.TRANSACTION_RESTRICTED);
super.message = message;
}
}
@@ -1,4 +1,4 @@
package com.murong.ecp.payment.processor.flow;
package com.murong.ecp.payment.processor.order;
import com.murong.ecp.payment.domain.ConsumeOrder;
import com.murong.ecp.payment.processor.ProcessorChain;
@@ -1,4 +1,4 @@
package com.murong.ecp.payment.processor.flow;
package com.murong.ecp.payment.processor.order;
import com.murong.ecp.payment.domain.ConsumeOrder;
import lombok.extern.slf4j.Slf4j;
@@ -1,4 +1,4 @@
package com.murong.ecp.payment.processor.flow;
package com.murong.ecp.payment.processor.order;
import com.murong.ecp.payment.domain.ConsumeOrder;
import lombok.extern.slf4j.Slf4j;
@@ -1,4 +1,4 @@
package com.murong.ecp.payment.processor.payment;
package com.murong.ecp.payment.processor.tool;
import com.murong.ecp.payment.domain.ConsumeOrder;
import com.murong.ecp.payment.enums.PaymentMethod;
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Service;
@Service
@Slf4j
public class BankCardToolProcessor extends PaymentToolDefaultProcessor {
public BankCardToolProcessor(){
public class BankCardProcessor extends ToolDefaultProcessor {
public BankCardProcessor(){
super(PaymentMethod.CREDIT_CARD,PaymentMethod.DEBIT_CARD);
}
@@ -31,6 +31,6 @@ public class BankCardToolProcessor extends PaymentToolDefaultProcessor {
}
@Override
void recordAccounting() {
public void accounting(ConsumeOrder order) {
}
}
@@ -1,4 +1,4 @@
package com.murong.ecp.payment.processor.payment;
package com.murong.ecp.payment.processor.tool;
import com.murong.ecp.payment.enums.PaymentMethod;
import com.murong.ecp.payment.domain.ConsumeOrder;
@@ -7,10 +7,10 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public abstract class PaymentToolDefaultProcessor implements ProcessorChain<ConsumeOrder> {
public abstract class ToolDefaultProcessor implements ProcessorChain<ConsumeOrder> {
protected PaymentMethod[] paymentMethods;
protected ProcessorChain next;
public PaymentToolDefaultProcessor(PaymentMethod... paymentMethods){
public ToolDefaultProcessor(PaymentMethod... paymentMethods){
log.info("PaymentToolProcessor:{}",paymentMethods);
this.paymentMethods = paymentMethods;
}
@@ -59,7 +59,7 @@ public abstract class PaymentToolDefaultProcessor implements ProcessorChain<Cons
/** register journal with success*/
}
public void onFailure(ConsumeOrder order){
/** register journal with failure*/
/** update journal with failure*/
}
public void onProcessing(ConsumeOrder order){
@@ -75,6 +75,10 @@ public abstract class PaymentToolDefaultProcessor implements ProcessorChain<Cons
this.next = next;
}
public abstract void accounting(ConsumeOrder order);
/**
* Pre Checker
* @param order
@@ -85,6 +89,4 @@ public abstract class PaymentToolDefaultProcessor implements ProcessorChain<Cons
log.info("PaymentToolProcessor.precheck");
return order.orderCreated() && order.riskPassed() ? true : false;
}
abstract void recordAccounting();
}
@@ -1,4 +1,4 @@
package com.murong.ecp.payment.processor.payment;
package com.murong.ecp.payment.processor.tool;
import com.murong.ecp.payment.domain.ConsumeOrder;
import com.murong.ecp.payment.enums.PaymentMethod;
@@ -10,8 +10,8 @@ import org.springframework.stereotype.Service;
*/
@Slf4j
@Service
public class WalletToolProcessor extends PaymentToolDefaultProcessor {
public WalletToolProcessor(){
public class WalletProcessor extends ToolDefaultProcessor {
public WalletProcessor(){
super(PaymentMethod.LOOP_BANK,PaymentMethod.LOOP_BANK);
}
@@ -29,6 +29,7 @@ public class WalletToolProcessor extends PaymentToolDefaultProcessor {
@Override
void recordAccounting() {
public void accounting(ConsumeOrder order) {
}
}
@@ -0,0 +1,7 @@
package com.murong.ecp.payment.service;
public class BreakdownRepository {
public void save(){
}
}
@@ -0,0 +1,12 @@
package com.murong.ecp.payment.util;
import com.murong.ecp.payment.domain.ConsumeOrder;
import org.springframework.stereotype.Service;
@Service
public class ConsumeOrderUtil {
public void saveOrder(ConsumeOrder order){
}
}