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

Merge tag '1.0.33' into develop

备案号
---

9bcfabd68520b59353552954ee919a43d71da07b
diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index cb55dad2,3aff51ff..433f7045
--- 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
@@@ -1,19 -1,13 +1,20 @@@
  package com.supwisdom.dlpay.api.controller
  
+ import com.google.gson.Gson
  import com.supwisdom.dlpay.agent.citizencard.YnrccUtil
  import com.supwisdom.dlpay.agent.service.CitizencardPayService
 +import com.supwisdom.dlpay.api.TransactionBuilder
  import com.supwisdom.dlpay.api.bean.*
 +import com.supwisdom.dlpay.api.bean.groups.ConfirmAction
 +import com.supwisdom.dlpay.api.bean.groups.InitAction
  import com.supwisdom.dlpay.api.exception.RequestParamCheckException
  import com.supwisdom.dlpay.api.service.*
 +import com.supwisdom.dlpay.exception.TransactionCheckException
  import com.supwisdom.dlpay.exception.TransactionException
  import com.supwisdom.dlpay.framework.ResponseBodyBuilder
 +import com.supwisdom.dlpay.framework.tenant.TenantContext
 +import com.supwisdom.dlpay.framework.util.Subject
 +import com.supwisdom.dlpay.framework.util.TradeCode
  import com.supwisdom.dlpay.framework.util.TradeDict
  import com.supwisdom.dlpay.framework.util.TradeErrorCode
  import com.supwisdom.dlpay.mobile.service.MobileApiService
@@@ -23,13 -18,10 +25,12 @@@ import mu.KotlinLoggin
  import org.apache.commons.beanutils.BeanUtils
  import org.springframework.beans.factory.annotation.Autowired
  import org.springframework.http.ResponseEntity
- 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 {