From d60ff56bfb2f7e64927d96c60240f763bf4af63b Mon Sep 17 00:00:00 2001
From: luzhaofeng <574317128@qq.com>
Date: Fri, 8 Nov 2019 14:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=B8=81=E6=A8=A1=E5=9D=97-=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E8=B5=84=E9=87=91=E5=AF=86=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E5=B8=82=E5=95=86?=
 =?UTF-8?q?=E6=97=B6=E5=88=A4=E6=96=AD=E6=9C=AA=E5=AE=8C=E7=BB=93=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/otc/service/impl/MarketApplyServiceImpl.java   | 2 +-
 .../server/otc/service/impl/WalletServiceImpl.java        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/MarketApplyServiceImpl.java b/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/MarketApplyServiceImpl.java
index 2debd24..9ea15ab 100644
--- a/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/MarketApplyServiceImpl.java
+++ b/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/MarketApplyServiceImpl.java
@@ -204,7 +204,7 @@ public class MarketApplyServiceImpl implements MarketApplyService {
                 null, null, null, null);
         //如果用户的广告列表有未完成或着未取消的广告，抛出异常
         for (ListUserAdDTO ad : ads) {
-            if (!ad.getAdStatus().equals(AdConstants.CANCEL) || !ad.getAdStatus().equals(AdConstants.FINISH)) {
+            if (!ad.getAdStatus().equals(AdConstants.CANCEL) && !ad.getAdStatus().equals(AdConstants.FINISH)) {
                 throw new OtcException(OtcEnums.CANCEL_MARKET_AD_NO_NULL);
             }
         }
diff --git a/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/WalletServiceImpl.java b/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/WalletServiceImpl.java
index 267ade1..1787611 100644
--- a/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/WalletServiceImpl.java
+++ b/blockchain-server/blockchain-server-otc/src/main/java/com/blockchain/server/otc/service/impl/WalletServiceImpl.java
@@ -103,10 +103,10 @@ public class WalletServiceImpl implements WalletService {
     @Override
     public void isPassword(String pass) {
         LOG.info("校验密码，参数：" + pass);
-//        if (StringUtils.isBlank(pass)) { TODO
-//            throw new OtcException(OtcEnums.PASS_NULL);
-//        }
-//        ethFeign.isPassword(pass);
+        if (StringUtils.isBlank(pass)) {
+            throw new OtcException(OtcEnums.PASS_NULL);
+        }
+        ethFeign.isPassword(pass);
     }
 
     /***