From 9bde194ca1612d21b416b2e11f97d09c470655a4 Mon Sep 17 00:00:00 2001
From: "kaixiang.xia" <kaixiang.xia@supwisdom.com>
Date: Fri, 30 Apr 2021 16:11:32 +0800
Subject: [PATCH] =?utf8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98=E7=94=A8?=
 =?utf8?q?=E6=88=B7=E6=9C=AA=E7=AD=BE=E7=BA=A6=E6=98=8E=E7=A1=AE=E9=94=99?=
 =?utf8?q?=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../supwisdom/dlpay/framework/util/TradeErrorCode.java |  2 ++
 .../dlpay/api/controller/consume_api_controller.kt     | 10 ++++++----
 .../api/service/impl/ynrcc_netpay_business_service.kt  |  4 ++++
 .../dlpay/api/service/ynrcc_netpay_business_service.kt |  3 +++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java
index 84a951e0..fab8949f 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java
@@ -130,6 +130,8 @@ public class TradeErrorCode {
 
   public static final int NO_DEAL_EEROR = 30005; // 无交易记录
 
+  public static final int BUSINESS_USER_NO_SIGN = 30006; // 用户未签约
+
   //============= 交易错误 ============//
   public static final int CARD_NOT_EXISTS = 40000; //卡不存在
 
diff --git 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
index 8d8a26d0..da34d6dc 100644
--- 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
@@ -849,14 +849,16 @@ class ConsumeAPIController {
      * */
     @PostMapping("/ynrccpay/order")
     fun ynrccPayOrder(@Valid @RequestBody param: YnrccPayOrderParam): ResponseEntity<Any> {
-        val userSign = ynrccNetPayBusinessService.queryUserYnrccPaySign(param.bankcardno, param.shopaccno)
+        val userSign = ynrccNetPayBusinessService.queryUserYnrccPaySignInfo(param.bankcardno, param.shopaccno)
+        if (null == userSign || !userSign.isSignFlag || StringUtil.isEmpty(userSign.customerSignNo)) {
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
+                .fail(TradeErrorCode.BUSINESS_USER_NO_SIGN, "用户未签约农商行网关快捷支付！"))
+        }
+
         val person = userService.findOnePersonByUserid(param.userid)
         if (person.userid != userSign.userid) {
             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.INPUT_DATA_ERROR, "银行卡持有人错误！"))
-        } else if (!userSign.isSignFlag || StringUtil.isEmpty(userSign.customerSignNo)) {
-            return ResponseEntity.ok(ResponseBodyBuilder.create()
-                    .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "用户未签约农商行网关快捷支付！"))
         }
         val dtlType = consumePayService.getDtltypeDictionary(param.dtltype, Dictionary.DTLTYPES)
         if (consumePayService.checkShopPaytype(param.shopaccno, TradeDict.PAYTYPE_YNRCC_PAY)) {
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/ynrcc_netpay_business_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/ynrcc_netpay_business_service.kt
index 6489303e..65f81452 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/ynrcc_netpay_business_service.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/ynrcc_netpay_business_service.kt
@@ -215,6 +215,10 @@ class YnrccNetPayBusinessServiceImpl(val personDao: PersonDao,
                 ?: throw RequestParamCheckException("银行卡签约记录不存在！")
     }
 
+    override fun queryUserYnrccPaySignInfo(bankcardno: String, shopaccno: String): TYnrccPaySign? {
+        return ynrccPaySignDao.getUserSign(bankcardno.trim(), shopaccno.trim())
+    }
+
     override fun doYnrccPayInit(transdtl: TTransactionMain, userSign: TYnrccPaySign): YnrccPayOrderResponse {
         if (StringUtil.isEmpty(transdtl.refno) || null == transdtl.shopDtl || null == transdtl.shopDtl.amount) {
             throw TransactionProcessException(TradeErrorCode.BUSINESS_DEAL_ERROR, "流水初始化错误！")
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/ynrcc_netpay_business_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/ynrcc_netpay_business_service.kt
index aa2ddecc..4884f070 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/ynrcc_netpay_business_service.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/ynrcc_netpay_business_service.kt
@@ -23,6 +23,9 @@ interface YnrccNetPayBusinessService {
     @Transactional(rollbackFor = [Exception::class], readOnly = true)
     fun queryUserYnrccPaySign(bankcardno: String, shopaccno: String): TYnrccPaySign
 
+    @Transactional(rollbackFor = [Exception::class], readOnly = true)
+    fun queryUserYnrccPaySignInfo(bankcardno: String, shopaccno: String): TYnrccPaySign?
+
     @Transactional(rollbackFor = [Exception::class], readOnly = true)
     fun doYnrccPayInit(transdtl: TTransactionMain, userSign: TYnrccPaySign): YnrccPayOrderResponse
 
-- 
2.17.1