ats 微信支付相关调整

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/comm/WxPartnerPayV3.java

@@ -198,7 +198,7 @@ public class WxPartnerPayV3 extends AbstractManager {
     private AtsQueryPayResultV3Response getNativePayResult(AtsQueryPayResultV3Request req, RSAPublicKeyConfig config) {
         com.wechat.pay.java.service.partnerpayments.nativepay.NativePayService service = new com.wechat.pay.java.service.partnerpayments.nativepay.NativePayService.Builder().config(config).build();
         com.wechat.pay.java.service.partnerpayments.nativepay.model.QueryOrderByOutTradeNoRequest request = new com.wechat.pay.java.service.partnerpayments.nativepay.model.QueryOrderByOutTradeNoRequest();
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         request.setSpMchid(req.getMchid());
         request.setSubMchid(req.getSubMchid());
         com.wechat.pay.java.service.partnerpayments.nativepay.model.Transaction transaction = service.queryOrderByOutTradeNo(request);
@@ -226,7 +226,7 @@ public class WxPartnerPayV3 extends AbstractManager {
         com.wechat.pay.java.service.partnerpayments.app.AppServiceExtension appService = new com.wechat.pay.java.service.partnerpayments.app.AppServiceExtension.Builder().config(config).build();
         com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByOutTradeNoRequest request =
                 new com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByOutTradeNoRequest();
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         request.setSpMchid(req.getMchid());
         request.setSubMchid(req.getSubMchid());
         com.wechat.pay.java.service.partnerpayments.app.model.Transaction transaction = appService.queryOrderByOutTradeNo(request);
@@ -254,7 +254,7 @@ public class WxPartnerPayV3 extends AbstractManager {
         com.wechat.pay.java.service.partnerpayments.jsapi.JsapiServiceExtension jsapiService = new com.wechat.pay.java.service.partnerpayments.jsapi.JsapiServiceExtension.Builder().config(config).build();
         com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByOutTradeNoRequest request =
                 new com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByOutTradeNoRequest();
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         request.setSpMchid(req.getMchid());
         request.setSubMchid(req.getSubMchid());
         com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction transaction = jsapiService.queryOrderByOutTradeNo(request);
@@ -282,7 +282,7 @@ public class WxPartnerPayV3 extends AbstractManager {
         com.wechat.pay.java.service.partnerpayments.h5.H5Service h5Service = new com.wechat.pay.java.service.partnerpayments.h5.H5Service.Builder().config(config).build();
         com.wechat.pay.java.service.partnerpayments.h5.model.QueryOrderByOutTradeNoRequest request =
                 new com.wechat.pay.java.service.partnerpayments.h5.model.QueryOrderByOutTradeNoRequest();
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         request.setSpMchid(req.getMchid());
         request.setSubMchid(req.getSubMchid());
         com.wechat.pay.java.service.partnerpayments.h5.model.Transaction transaction = h5Service.queryOrderByOutTradeNo(request);

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/comm/WxPayV3.java

@@ -190,7 +190,7 @@ public class WxPayV3 extends AbstractManager {
     private AtsQueryPayResultV3Response getNativePayResult(AtsQueryPayResultV3Request req, RSAPublicKeyConfig config) {
         NativePayService service = new NativePayService.Builder().config(config).build();
         QueryOrderByOutTradeNoRequest request = new QueryOrderByOutTradeNoRequest();
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         request.setMchid(req.getMchid());
         Transaction transaction = service.queryOrderByOutTradeNo(request);
         return getPayResult(transaction);
@@ -202,7 +202,7 @@ public class WxPayV3 extends AbstractManager {
         com.wechat.pay.java.service.payments.app.model.QueryOrderByOutTradeNoRequest request =
                 new com.wechat.pay.java.service.payments.app.model.QueryOrderByOutTradeNoRequest();
         request.setMchid(req.getMchid());
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         Transaction transaction = appService.queryOrderByOutTradeNo(request);
         return getPayResult(transaction);
     }
@@ -213,7 +213,7 @@ public class WxPayV3 extends AbstractManager {
         com.wechat.pay.java.service.payments.jsapi.model.QueryOrderByOutTradeNoRequest request =
                 new com.wechat.pay.java.service.payments.jsapi.model.QueryOrderByOutTradeNoRequest();
         request.setMchid(req.getMchid());
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         Transaction transaction = jsapiService.queryOrderByOutTradeNo(request);
         return getPayResult(transaction);
     }
@@ -223,7 +223,7 @@ public class WxPayV3 extends AbstractManager {
         H5Service h5Service = new H5Service.Builder().config(config).build();
         com.wechat.pay.java.service.payments.h5.model.QueryOrderByOutTradeNoRequest request =
                 new com.wechat.pay.java.service.payments.h5.model.QueryOrderByOutTradeNoRequest();
-        request.setOutTradeNo(req.getExternalOrderNo());
+        request.setOutTradeNo(req.getOutTradeNo());
         request.setMchid(req.getMchid());
         Transaction transaction = h5Service.queryOrderByOutTradeNo(request);
         return getPayResult(transaction);