From 41bba11c8c354d5deb579f1b0a9e1bc41fbb07e2 Mon Sep 17 00:00:00 2001 From: "yunpeng.ma" Date: Thu, 27 Feb 2020 13:17:48 +0800 Subject: [PATCH] =?utf8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../dlpay/paysdk/proxy/TransactionProxy.java | 11 +++++++++++ .../supwisdom/dlpay/agent/service/inapp_wechatpay.kt | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/TransactionProxy.java b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/TransactionProxy.java index 087936e5..045ba980 100644 --- a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/TransactionProxy.java +++ b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/TransactionProxy.java @@ -3,6 +3,7 @@ package com.supwisdom.dlpay.paysdk.proxy; import com.supwisdom.dlpay.api.bean.*; import com.supwisdom.mutlitenant.client.annotations.JwtMethod; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,4 +28,14 @@ public interface TransactionProxy { @PostMapping("/api/deposit/merchant/confirm") @JwtMethod MerchantDepositResponse depositConfirm(@RequestBody MerchantDepositParam param); + + @GetMapping("/api/transaction/inapp/query") + @JwtMethod + TransactionQueryResponse query(@RequestBody String param); + + @PostMapping("/api/transaction/inapp/payinit") + @JwtMethod + InAppPayResponse payinit(@RequestBody InAppPayParam param); + + } diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/inapp_wechatpay.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/inapp_wechatpay.kt index 2022d9ad..494e1344 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/inapp_wechatpay.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/agent/service/inapp_wechatpay.kt @@ -2,6 +2,7 @@ package com.supwisdom.dlpay.agent.service import com.supwisdom.dlpay.agent.AgentResponse import com.supwisdom.dlpay.agent.InAppPayService +import com.supwisdom.dlpay.agent.domain.QrcodePayTrans import com.supwisdom.dlpay.api.domain.TTransactionMain import com.supwisdom.dlpay.api.service.SourceTypeService import org.springframework.http.HttpRequest @@ -12,12 +13,17 @@ class WechatPayResponse { } @Component("wechatInAppAgent") -class WechatInAppService(private val sourceTypeService: SourceTypeService) +class WechatInAppService(private val sourceTypeService: SourceTypeService, + private val wechatService: WechatService) : InAppPayService { val APIUrl = "https://api.mch.weixin.qq.com/pay/unifiedorder" - override fun init(transation: TTransactionMain?): AgentResponse { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + override fun init(transation: TTransactionMain): AgentResponse { + val wechatPayResponse = AgentResponse(); + val agentResponse = wechatService.doPrepay(transation); + System.err.println("++++++++++++++++"); + System.err.println(agentResponse); + return wechatPayResponse; } override fun notify(transaction: TTransactionMain?, request: HttpRequest?): AgentResponse { -- 2.17.1