法币模块-打开资金密码校验、修复取消市商时判断未完结广告的BUG

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);
             }
         }

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
+        if (StringUtils.isBlank(pass)) {
-//            throw new OtcException(OtcEnums.PASS_NULL);
+            throw new OtcException(OtcEnums.PASS_NULL);
-//        }
+        }
-//        ethFeign.isPassword(pass);
+        ethFeign.isPassword(pass);
     }
 
     /***