From c2bc2dd634ebbcdd64750c0c541044a32bdf6056 Mon Sep 17 00:00:00 2001
From: "sijun.li" <sijun.li@supwisdom.com>
Date: Tue, 21 Apr 2020 15:37:54 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E7=BA=A6=E6=8E=A5?=
 =?utf8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt    |  4 ++--
 .../main/java/com/supwisdom/agent/Util/DlpayUtil.java |  2 ++
 .../api/service/impl/YnrccParamCheckServiceImpl.java  | 11 +++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
index 8854b197..08cfbc84 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -419,7 +419,7 @@ class ApiV1 {
             return JsonResult.error(resp.message)
         }
         var needupdate = false
-        if (resp.sinstatus == "1") {
+        if (resp.sinstatus == YnrccUtil.TRANSTYPE_SIGNCARD ) {
             signed = TradeDict.STATUS_YES
             if(!card.signed){
                 card.signed = true
@@ -472,7 +472,7 @@ class ApiV1 {
             return JsonResult.error(resp.message)
         }
 
-        if (resp.sinstatus == "1") {
+        if (resp.sinstatus == YnrccUtil.TRANSTYPE_SIGNCARD ) {
             signed = TradeDict.STATUS_YES
             if(!card.signed){
                 card.signed = true
diff --git a/ynrcc-agent/src/main/java/com/supwisdom/agent/Util/DlpayUtil.java b/ynrcc-agent/src/main/java/com/supwisdom/agent/Util/DlpayUtil.java
index d5150df8..c54c0a1d 100644
--- a/ynrcc-agent/src/main/java/com/supwisdom/agent/Util/DlpayUtil.java
+++ b/ynrcc-agent/src/main/java/com/supwisdom/agent/Util/DlpayUtil.java
@@ -20,6 +20,8 @@ public class DlpayUtil {
   public static final String OPTYPE_QUERYRESULT = "queryresult"; //消费结果查询
   public static final String OPTYPE_CHKDTL = "chkdtl"; //流水对账
 
+  public static final String TRANSTYPE_SIGNCARD = "1"; //签约
+
   /**
    * socket方式请求农商行
    */
diff --git a/ynrcc-agent/src/main/java/com/supwisdom/agent/api/service/impl/YnrccParamCheckServiceImpl.java b/ynrcc-agent/src/main/java/com/supwisdom/agent/api/service/impl/YnrccParamCheckServiceImpl.java
index bea60e86..cd6429ec 100644
--- a/ynrcc-agent/src/main/java/com/supwisdom/agent/api/service/impl/YnrccParamCheckServiceImpl.java
+++ b/ynrcc-agent/src/main/java/com/supwisdom/agent/api/service/impl/YnrccParamCheckServiceImpl.java
@@ -1,5 +1,6 @@
 package com.supwisdom.agent.api.service.impl;
 
+import com.supwisdom.agent.Util.DlpayUtil;
 import com.supwisdom.agent.Util.ErrorCode;
 import com.supwisdom.agent.Util.MD5;
 import com.supwisdom.agent.Util.StringUtil;
@@ -131,10 +132,12 @@ public class YnrccParamCheckServiceImpl implements YnrccParamCheckService {
       resp.setMessage("请求参数错误[签约标志]");
       return false;
     }
-    if (StringUtil.isEmpty(captcha)) {
-      resp.setCode(ErrorCode.REQ_PARAM_ERROR);
-      resp.setMessage("请求参数错误[验证码为空]");
-      return false;
+    if (DlpayUtil.TRANSTYPE_SIGNCARD.equals(transtype)) {
+      if (StringUtil.isEmpty(captcha)) {
+        resp.setCode(ErrorCode.REQ_PARAM_ERROR);
+        resp.setMessage("请求参数错误[验证码为空]");
+        return false;
+      }
     }
 
     return true;
-- 
2.17.1