From: kaixiang.xia <kaixiang.xia@supwisdom.com>
Date: Tue, 25 May 2021 10:52:18 +0000 (+0800)
Subject: Merge tag '1.0.32' into develop
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=46072de5700319e30a7ab6c1bf9fcf78931c39fa;p=epayment%2Ffood_payapi.git

Merge tag '1.0.32' into develop

农商行快捷支付
---

46072de5700319e30a7ab6c1bf9fcf78931c39fa
diff --cc payapi/build.gradle
index d7eb36a3,7a4c6cf2..c6061a28
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@@ -112,9 -112,14 +112,14 @@@ dependencies 
      implementation group: 'taglibs', name: 'standard', version: '1.1.2'
      implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
      implementation files('libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar')
 -//    implementation files('libs/ojdbc6.jar')
 +    //    implementation files('libs/ojdbc6.jar')
      implementation 'commons-dbcp:commons-dbcp:1.4'
      implementation 'commons-beanutils:commons-beanutils:1.9.3'
+     implementation files('libs/ynrcc-openapi-sdk-1.1.2-RELEASE.jar')
+ 
+     //大理农商行sdk需求jar
+     implementation 'cn.hutool:hutool-crypto:5.4.7'
+     implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
  
      implementation 'log4j:log4j:1.2.17'
      implementation 'com.alibaba:fastjson:1.2.60'
diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index 047cf60c,8d8fb8fe..cb55dad2
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
@@@ -25,8 -19,8 +26,10 @@@ import org.springframework.http.Respons
  import org.springframework.validation.annotation.Validated
  import org.springframework.web.bind.annotation.*
  import java.net.URLDecoder
 +import kotlin.math.roundToInt
+ import javax.validation.Valid
+ 
 +
  @RestController
  @RequestMapping("/api/user")
  class UserAPIController {
@@@ -52,11 -40,10 +55,12 @@@
      private lateinit var citizencardPayService: CitizencardPayService
      @Autowired
      private lateinit var qrcodeService: QRCodeService
- 
- 
      @Autowired
 +    private lateinit var transactionService: TransactionServiceProxy
- 
++    @Autowired
+     private lateinit var ynrccNetPayBusinessService: YnrccNetPayBusinessService
+     @Autowired
+     private lateinit var userMessageService: UserMessageService
  
      @PostMapping("/open")
      fun openAccount(@RequestBody param: OpenUserParam): ResponseEntity<Any> {