From: kaixiang.xia <kaixiang.xia@supwisdom.com>
Date: Mon, 26 Oct 2020 07:38:34 +0000 (+0800)
Subject: Merge tag '1.0.27' into develop
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=7c782d00e01cd80fc852d25c07a53f2cef347e98;p=epayment%2Ffood_payapi.git

Merge tag '1.0.27' into develop

市民卡信息新增公交卡字段
---

7c782d00e01cd80fc852d25c07a53f2cef347e98
diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt
index 6779e80a,657b64df..87e054cd
--- 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
@@@ -346,8 -344,8 +344,6 @@@ class ConsumeAPIController 
              transactionService.wip(refundTrans.refno)
              val service = createAgentService<Any>(mainDtl.sourceType)
              val resp = service.refund(refundTrans)
--            resp.code = AgentCode.SUCCESS
--            resp.agentRefno = systemUtilService.refno
              when (resp.code) {
                  AgentCode.SUCCESS -> {
                      transactionService.success(refundTrans.refno, resp.agentRefno, false)
diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index ce7a15a0,755d619a..2c80fa3f
--- 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,18 +1,22 @@@
  package com.supwisdom.dlpay.api.controller
  
+ 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.CardService
 -import com.supwisdom.dlpay.api.service.KafkaSendMsgService
 -import com.supwisdom.dlpay.api.service.QRCodeService
 -import com.supwisdom.dlpay.api.service.UserService
 +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
  import com.supwisdom.dlpay.system.bean.LevelBean
  import com.supwisdom.dlpay.system.service.PointsService
  import org.apache.commons.beanutils.BeanUtils
@@@ -29,22 -26,22 +32,31 @@@ import kotlin.math.roundToIn
  class UserAPIController {
      @Autowired
      private lateinit var useService: UserService
 +
 +    @Autowired
 +    private lateinit var accountUtilServcie: AccountUtilServcie
 +
      @Autowired
      private lateinit var cardService: CardService
 +
      @Autowired
      private lateinit var kafkaSendMsgService: KafkaSendMsgService
 +
      @Autowired
      private lateinit var pointsService: PointsService
+     @Autowired
+     private lateinit var mobileApiService: MobileApiService
+     @Autowired
+     private lateinit var userService: UserService
+     @Autowired
+     private lateinit var citizencardPayService: CitizencardPayService
+     @Autowired
+     private lateinit var qrcodeService: QRCodeService
+ 
  
 +    @Autowired
 +    private lateinit var transactionService: TransactionServiceProxy
 +
  
      @PostMapping("/open")
      fun openAccount(@RequestBody param: OpenUserParam): ResponseEntity<Any> {
@@@ -391,10 -187,9 +403,10 @@@
                      .fail(500, ret.get("msg") as String))
          }
      }
 +
      @PostMapping("/getTask")
-     fun getTPointsTaskNoPage(): ResponseEntity<Any> {
-         val ret = pointsService.getTPointsTaskNoPage()
+     fun getTPointsTaskNoPage(userid:String?): ResponseEntity<Any> {
+         val ret = pointsService.getTPointsTaskNoPage(userid)
          return if(ret.get("code")==200){
              ResponseEntity.ok(ResponseBodyBuilder.create().data("data", ret.get("dataList")!!)
                      .success("ok"))
@@@ -403,7 -198,16 +415,18 @@@
                      .fail(500, ret.get("msg") as String))
          }
      }
 +
+     @PostMapping("/getTaskStatus")
+     fun getTaskStatus(userid:String,taskid:Int): ResponseEntity<Any> {
+         val dtl = pointsService.getTaskStatus(userid,taskid)
+         var time = ""
+         if (dtl != null) {
+             time = dtl.transdate + dtl.transtime
+         }
+         return ResponseEntity.ok(ResponseBodyBuilder.create().data("data",time)
+                 .success("ok"))
+     }
++
      @PostMapping("/getUserPoints")
      fun getUserPoints(@RequestBody param: UserPointsParam): ResponseEntity<Any> {
          var lev = LevelBean()