创建项目

baa-pay-core/src/main/java/cn/quant/baa/pay/acquirer/MerchantAcquirer.java

@@ -9,7 +9,6 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.Charset;
-import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.Map;
 

baa-pay-core/src/main/java/cn/quant/baa/pay/model/web/PayRequestData.java

 package cn.quant.baa.pay.model.web;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -64,6 +65,7 @@ public class PayRequestData implements Serializable{
     /**
      * 用信金额
      */
+    @NotEmpty(message = "ILLEGAL_REQ_CREDIT_AMT")
     @NotNull(message = "ILLEGAL_REQ_CREDIT_AMT")
     private String creditAmount;
 

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

 package cn.quant.baa.pay.service;
 
+import cn.quant.baa.pay.acquirer.Acquirer;
 import cn.quant.baa.pay.acquirer.AcquirerConfiguration;
+import cn.quant.baa.pay.acquirer.MerchantAcquirer;
 import cn.quant.baa.pay.context.TransactionSession;
 import cn.quant.baa.pay.jpa.entity.*;
 import cn.quant.baa.pay.util.AssertUtils;
@@ -30,6 +32,9 @@ public class TransactionService extends BusinessService {
     @Autowired
     private AcquirerConfiguration acquirerConfiguration;
 
+    @Autowired
+    private MerchantAcquirer acquirer;
+
     @Transactional(propagation = Propagation.NOT_SUPPORTED)
     public void check(PayHistoryIds ids, TransactionSession session) {
         PayHistoryEntity historyEntity = session.findOne(PayHistoryEntity.class, ids);
@@ -38,8 +43,10 @@ public class TransactionService extends BusinessService {
         }
     }
 
+
+
     @Transactional
-    public PayHistoryEntity pay(PayRequestData data) {
+    public TransactionSession payHistory(PayRequestData data){
 
         validate(data);
 
@@ -90,7 +97,23 @@ public class TransactionService extends BusinessService {
 
         session.commit();
 
-        return history;
+        session.addProperty(PayHistoryEntity.class, history);
+        session.addProperty(PayGoodsDetailEntity.class, details);
+
+        return session;
+    }
+
+
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public void pay(PayRequestData data) {
+
+        TransactionSession session = payHistory(data);
+
+        session.getProperty(PayHistoryEntity.class, PayHistoryEntity.class);
+        System.currentTimeMillis();
+//        acquirer.pay(history, data);
+
+
 
     }
 }

baa-pay-core/src/main/resources/messages.properties

+EMPTY_REQ_DATA=Illegal request data.
+ILLEGAL_REQ_MCH_ID=Illegal merchant id - {0}.
+ILLEGAL_REQ_CHAN_ID=Illegal pay channel id - {0}.
+ILLEGAL_REQ_BUYER_ID=Illegal payer id - {0}.
+ILLEGAL_REQ_INST_ID=Illegal institution id - {0}.
+ILLEGAL_REQ_PROD_ID=Illegal product id - {0}.
+ILLEGAL_REQ_OUT_TRADE_NO=Illegal order numer - {0}.
+
+EXIST_ORDER=Exist order - {0}, {1}, {2}.
+
+ACQUIRER_NOSUCH=No such acquirer channel - {0}.
+ACQUIRER_NOMATCH=Merchant acquirer channel  does not match - {0}, {1}.
\ No newline at end of file

baa-pay-core/src/main/resources/messages_en.properties

+EMPTY_REQ_DATA=Illegal request data.
+ILLEGAL_REQ_MCH_ID=Illegal merchant id - {0}.
+ILLEGAL_REQ_CHAN_ID=Illegal pay channel id - {0}.
+ILLEGAL_REQ_BUYER_ID=Illegal payer id - {0}.
+ILLEGAL_REQ_INST_ID=Illegal institution id - {0}.
+ILLEGAL_REQ_PROD_ID=Illegal product id - {0}.
+ILLEGAL_REQ_OUT_TRADE_NO=Illegal order numer - {0}.
+
+EXIST_ORDER=Exist order - {0}, {1}, {2}.
+
+ACQUIRER_NOSUCH=No such acquirer channel - {0}.
+ACQUIRER_NOMATCH=Merchant acquirer channel  does not match - {0}, {1}.
\ No newline at end of file

baa-pay-core/src/main/resources/messages_zh_CN.properties

+EMPTY_REQ_DATA=\u8BF7\u6C42\u6570\u636E\u683C\u5F0F\u9519\u8BEF
+ILLEGAL_REQ_SUBJECT={0}-\u8BA2\u5355\u6807\u9898\u9519\u8BEF
+ILLEGAL_REQ_MCH_ID={0}-\u5546\u6237ID\u9519\u8BEF
+ILLEGAL_REQ_CHAN_ID={0}-\u652F\u4ED8\u901A\u9053ID\u9519\u8BEF
+ILLEGAL_REQ_BUYER_ID={0}-\u652F\u4ED8\u8005ID\u9519\u8BEF
+ILLEGAL_REQ_INST_ID={0}-\u673A\u6784ID\u9519\u8BEF
+ILLEGAL_REQ_PROD_ID={0}-\u4EA7\u54C1ID\u9519\u8BEF
+ILLEGAL_REQ_OUT_TRADE_NO={0}-\u8BA2\u5355\u53F7\u9519\u8BEF
+ILLEGAL_REQ_ORIG_AMT={0}-\u539F\u91D1\u989D\u9519\u8BEF
+ILLEGAL_REQ_AMT={0}-\u5B9E\u9645\u91D1\u989D\u9519\u8BEF
+ILLEGAL_REQ_DISC_AMT={0}-\u4F18\u60E0\u91D1\u989D\u9519\u8BEF
+ILLEGAL_REQ_CASH_AMT={0}-\u73B0\u91D1\u91D1\u989D\u9519\u8BEF
+ILLEGAL_REQ_CREDIT_AMT={0}-\u7528\u4FE1\u91D1\u989D\u9519\u8BEF
+
+EXIST_ORDER=\u8BA2\u5355\u5DF2\u5B58\u5728 - {0}, {1}, {2}
+
+ACQUIRER_NOSUCH=\u65E0\u6548\u7684\u6536\u5355\u901A\u9053 - {0}
+ACQUIRER_NOMATCH=\u65E0\u6548\u7684\u5546\u6237\u6536\u5355\u901A\u9053 - {0}, {1}
\ No newline at end of file

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

@@ -25,7 +25,7 @@ public class TransactionController extends BusinessController {
     public void pay(@RequestBody BusinessRequest<PayRequestData> request) {
 
         PayRequestData data = request.getData();
-        PayHistoryEntity pay = transactionService.pay(data);
+        transactionService.pay(data);
 
         System.currentTimeMillis();
     }