From 9a11e5e25531364608c6b4b45a9876bc342fc9b2 Mon Sep 17 00:00:00 2001 From: qiaowei Date: Thu, 25 Jul 2019 09:38:59 +0800 Subject: [PATCH] =?utf8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?utf8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java | 3 ++- .../com/supwisdom/dlpay/agent/service/wechat_service.kt | 4 ++-- .../supwisdom/dlpay/api/controller/consume_api_controller.kt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java b/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java index 937e116d..be862025 100644 --- a/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java +++ b/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java @@ -161,7 +161,8 @@ public class CitizenCardPayProxyTest { param.setTranstime(DateUtil.getNow("HHmmss")); //param.setTenantid("default"); param.setShopaccno("2000000012"); - param.setQrcode("134869374484110144"); + param.setQrcode("134985742861278239"); + param.setUserid("402882816be4b6b9016be4b78ab30001"); param.setDtltype("canteen"); param.setSpip("172.28.43.3"); QrcodePayResponse response = consumePropxy.qrcodePayInit(param); diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/wechat_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/wechat_service.kt index f07cf845..7fe78de5 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/wechat_service.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/wechat_service.kt @@ -43,8 +43,8 @@ class WeChatPayAgentService(val consumePayService: ConsumePayService, override fun pay(transaction: TTransactionMain?): AgentResponse { return when (transaction!!.transCode) { - TradeCode.TRANSCODE_QRCODE -> wechatService.doQrcodepay(transaction!!) - else -> wechatService.doPrepay(transaction!!) + TradeCode.TRANSCODE_QRCODE -> wechatService.doQrcodepay(transaction) + else -> wechatService.doPrepay(transaction) } } diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt index 483efd1f..673b575e 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt @@ -584,7 +584,7 @@ class ConsumeAPIController { .addDebitCreditRecord(AccountProxy(stSubject), AccountProxy(shopacc), amount, qrcodeSummary(sourceType)) } else { - val account = accountUtilServcie.readAccount(qrcodeTrans.userid) + val account = accountUtilServcie.readAccount(param.userid) builder.person(account).apply { setAmount(amount, TradeDict.TRADE_FLAG_OUT) setOpposite(shopacc.shopaccno, shopacc.shopname) -- 2.17.1