From: qiaowei <jov123@163.com>
Date: Thu, 11 Apr 2019 09:54:27 +0000 (+0800)
Subject: 第三方请求接口修改
X-Git-Tag: 1.0.0^2~310
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d67b73ac6fe68bc2c63ea9820c22c15445a6842a;p=epayment%2Ffood_payapi.git

第三方请求接口修改
---

diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt
index 30703507..323ac49b 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/consume/ThirdPayCall.kt
@@ -16,7 +16,7 @@ import com.supwisdom.dlpay.util.MoneyUtil
 class CallService {
 
     companion object {
-        fun callYktPay(config: Map<String, String>, paydtl: TUserdtl, time: String, callback: (code: BaseResp) -> Unit) {
+        fun callYktPay(config: Map<String, String>, paydtl: TUserdtl, time: String): BaseResp {
             lateinit var code:BaseResp
 
             var appid = config["appid"]
@@ -51,8 +51,7 @@ class CallService {
                         if (result == null) {
                             code.retcode = "1"
                             code.retmsg = "返回内容为空"
-                            callback(code)
-                            return
+                            return code
                         }
                         if (!"0".equals(result.getRetcode())) {
                             if ("30".equals(result.getRetcode())) {
@@ -64,8 +63,7 @@ class CallService {
                                             if (3 == supStatusRevResp.getStatus() && supStatusRevResp.getRevflag() != null && !supStatusRevResp.getRevflag()) {
                                                 code.retcode = "0"
                                                 code.retmsg = "成功"
-                                                callback(code)
-                                                return
+                                                return code
                                             }
                                         }
                                     } catch (e: Exception ) {
@@ -75,13 +73,11 @@ class CallService {
                             }
                             code.retcode = "1"
                             code.retmsg = "交易失败:" + result.getRetmsg()
-                            callback(code)
-                            return
+                            return code
                         }
                         code.retcode = "0"
                         code.retmsg = "成功"
-                        callback(code)
-                        return
+                        return code
                     } catch (e: Exception) {
                         e.printStackTrace()
                     }
@@ -89,7 +85,7 @@ class CallService {
             }
             code.retcode = "1"
             code.retmsg = "请求失败"
-            callback(code)
+            return code
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt
index 61ce9f54..eb02d453 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt
@@ -84,13 +84,16 @@ class ConsumeController {
         //一卡通支付款 112240
         val dtl = PersonTransBuilder.newBuilder(accountUtilServcie)
                 .done(refno, TradeDict.DTL_STATUS_WIP, personBalancePayService)
-        CallService.callYktPay(paytypeService.getPaytypeConfigByPaytype(PaytypeUtil.YKTPAY), dtl, DateUtil.getNow()) { code ->
-            if (code.retcode == "0") {
-                 //TODO update dtl
-               var dtl = PersonTransBuilder.newBuilder(accountUtilServcie)
-                        .done(dtl.refno,TradeDict.DTL_STATUS_SUCCESS,personBalancePayService)
-            }
+        var code = CallService.callYktPay(paytypeService.getPaytypeConfigByPaytype(PaytypeUtil.YKTPAY), dtl, DateUtil.getNow())
+        if (code.retcode == "0") {
+            //TODO update dtl
+            var suc = PersonTransBuilder.newBuilder(accountUtilServcie)
+                    .done(dtl.refno,TradeDict.DTL_STATUS_SUCCESS,personBalancePayService)
+            return ResponseEntity.ok(suc)
+        }else {
+            var fail = PersonTransBuilder.newBuilder(accountUtilServcie)
+                    .done(dtl.refno,TradeDict.DTL_STATUS_FAIL,personBalancePayService)
+            return ResponseEntity.ok(fail)
         }
-        return ResponseEntity.ok(dtl)
     }
 }
\ No newline at end of file