创建项目

baa-pay-core/src/main/java/cn/quant/baa/pay/jpa/entity/EntityBuilder.java

@@ -9,6 +9,7 @@ import cn.quant.spring.util.DateUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import static cn.quant.baa.pay.Constant.MINI_LOCAL_DATE;
@@ -17,6 +18,14 @@ import static cn.quant.baa.pay.Constant.MINI_LOCAL_DATE;
  * Created by Administrator on 2021/8/27 0027.
  */
 public class EntityBuilder {
+
+    private static int nextTxnNo(AccountEntity account) {
+        Integer txnNo = account.getNextTxnNo();
+        account.setTxnNo(txnNo);
+        account.setNextTxnNo(txnNo + 1);
+        return txnNo;
+    }
+
     public static AccountEntity account(AccountIds ids, String productId, long accountId, String buyerId, int partitionKey) {
         LocalDate now = LocalDate.now();
         AccountEntity account = new AccountEntity();
@@ -77,6 +86,7 @@ public class EntityBuilder {
         entity.setMobilePhone(data.getPhoneNo());
         entity.setNotifyUrl(data.getNotifyUrl());
         entity.setOriginalTxnAmount(origAmt);
+        entity.setPayDueTime(LocalDateTime.now().plusMinutes(30));
         entity.setPayAcctId(profile.getPayAcctId());
         entity.setPayChanCode(profile.getPayChanCode());
         entity.setPayAppId(profile.getPayAppId());
@@ -95,7 +105,8 @@ public class EntityBuilder {
         entity.setTxnAmount(amount);
         entity.setTxnDate(session.getBusinessLocalDate());
         entity.setTxnTime(session.getBusinessLocalTime());
-        entity.setTxnTypeCode("RETL");
+        entity.setTxnType("RETL");
+        entity.setTxnNo(nextTxnNo(account));
         if (cash.compareTo(BigDecimal.ZERO) > 0) {
             entity.setTxnCode("R001");
         } else {

baa-pay-core/src/main/java/cn/quant/baa/pay/jpa/entity/PayHistoryEntity.java

@@ -11,6 +11,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Date;
 import java.util.Objects;
@@ -56,12 +57,15 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
     @Column(name = "PAY_METHOD", nullable = false, updatable = false, length = 4)
     private PayMethod payMethod;
 
-    @Column(name = "TXN_TYPE_CODE", nullable = false, updatable = false, length = 4)
-    private String txnTypeCode;
+    @Column(name = "TXN_TYPE", nullable = false, updatable = false, length = 4)
+    private String txnType;
 
     @Column(name = "TXN_CODE", nullable = false, updatable = false, length = 4)
     private String txnCode;
 
+    @Column(name = "TXN_NO", nullable = false, updatable = false)
+    private Integer txnNo;
+
     @Column(name = "STATISTICS_CODE", nullable = false, updatable = false, length = 4)
     private String statisticsCode;
 
@@ -100,6 +104,9 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
     @Column(name = "TXN_TIME", nullable = false, updatable = false)
     private LocalTime txnTime;
 
+    @Column(name = "PAY_DUE_TIME", nullable = false, updatable = false)
+    private LocalDateTime payDueTime;
+
     @Column(name = "REQUEST_ID", nullable = false, updatable = false, length = 64)
     private String requestId;
 
@@ -204,12 +211,12 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
         this.payMethod = payMethod;
     }
 
-    public String getTxnTypeCode() {
-        return txnTypeCode;
+    public String getTxnType() {
+        return txnType;
     }
 
-    public void setTxnTypeCode(String txnTypeCode) {
-        this.txnTypeCode = txnTypeCode;
+    public void setTxnType(String txnTypeCode) {
+        this.txnType = txnTypeCode;
     }
 
     public String getTxnCode() {
@@ -220,6 +227,14 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
         this.txnCode = txnCode;
     }
 
+    public Integer getTxnNo() {
+        return txnNo;
+    }
+
+    public void setTxnNo(Integer txnNo) {
+        this.txnNo = txnNo;
+    }
+
     public String getStatisticsCode() {
         return statisticsCode;
     }
@@ -316,6 +331,14 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
         this.txnTime = txnTime;
     }
 
+    public LocalDateTime getPayDueTime() {
+        return payDueTime;
+    }
+
+    public void setPayDueTime(LocalDateTime payDueTime) {
+        this.payDueTime = payDueTime;
+    }
+
     public String getRequestId() {
         return requestId;
     }
@@ -403,13 +426,14 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
         sb.append(", payChanCode='").append(payChanCode).append('\'');
         sb.append(", payAcctId='").append(payAcctId).append('\'');
         sb.append(", subject='").append(subject).append('\'');
-        sb.append(", statusCode='").append(statusCode).append('\'');
+        sb.append(", statusCode=").append(statusCode);
         sb.append(", currencyCode=").append(currencyCode);
-        sb.append(", payMethod='").append(payMethod).append('\'');
-        sb.append(", txnTypeCode='").append(txnTypeCode).append('\'');
+        sb.append(", payMethod=").append(payMethod);
+        sb.append(", txnType='").append(txnType).append('\'');
         sb.append(", txnCode='").append(txnCode).append('\'');
+        sb.append(", txnNo=").append(txnNo);
         sb.append(", statisticsCode='").append(statisticsCode).append('\'');
-        sb.append(", creditDebitFlag='").append(creditDebitFlag).append('\'');
+        sb.append(", creditDebitFlag=").append(creditDebitFlag);
         sb.append(", customerGenFlag=").append(customerGenFlag);
         sb.append(", originalTxnAmount=").append(originalTxnAmount);
         sb.append(", txnAmount=").append(txnAmount);
@@ -420,6 +444,7 @@ public class PayHistoryEntity extends DescribablePartitionEntity implements Seri
         sb.append(", statementeFlag=").append(statementeFlag);
         sb.append(", txnDate=").append(txnDate);
         sb.append(", txnTime=").append(txnTime);
+        sb.append(", payDueTime=").append(payDueTime);
         sb.append(", requestId='").append(requestId).append('\'');
         sb.append(", requestTime=").append(requestTime);
         sb.append(", shopName='").append(shopName).append('\'');

baa-pay-core/src/main/java/cn/quant/baa/pay/service/TransactionService.java

@@ -39,7 +39,7 @@ public class TransactionService extends BusinessService {
     }
 
     @Transactional
-    public void pay(PayRequestData data) {
+    public PayHistoryEntity pay(PayRequestData data) {
 
         validate(data);
 
@@ -90,5 +90,7 @@ public class TransactionService extends BusinessService {
 
         session.commit();
 
+        return history;
+
     }
 }

baa-pay-server/src/main/java/cn/quant/baa/pay/rest/TransactionController.java

 package cn.quant.baa.pay.rest;
 
 import cn.quant.baa.pay.annotation.BusinessMapping;
+import cn.quant.baa.pay.jpa.entity.PayHistoryEntity;
 import cn.quant.baa.pay.model.BusinessRequest;
 import cn.quant.baa.pay.model.GoodsDetail;
 import cn.quant.baa.pay.model.PayRequestData;
@@ -29,12 +30,8 @@ public class TransactionController extends BusinessController {
     @PostMapping("/pay")
     public void pay(@RequestBody BusinessRequest<PayRequestData> request) {
 
-
         PayRequestData data = request.getData();
-
-
-        transactionService.pay(data);
-
+        PayHistoryEntity pay = transactionService.pay(data);
 
         System.currentTimeMillis();
     }