Merge branch 'pre' into dev

12 months ago · bafb6b1558
parent 6df22cda3d 8dd3477c9c
commit bafb6b1558
2 changed files with 2 additions and 0 deletions
--- a/open-api/src/main/java/com/api/controller/v1/NotifyController.java
+++ b/open-api/src/main/java/com/api/controller/v1/NotifyController.java
@ -89,6 +89,7 @@ public class NotifyController {
                responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
                responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
                responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
+                responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
                responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
                responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
                responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());
--- a/open-api/src/main/java/com/api/controller/v1/TradeController.java
+++ b/open-api/src/main/java/com/api/controller/v1/TradeController.java
@ -152,6 +152,7 @@ public class TradeController {
            responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
            responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
            responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
+            responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
            responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
            responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
            responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());