From a06b3e165297c90b974cf5e516912873ae827d00 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 13 Jan 2021 21:28:47 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index e0c59eb..c87652c 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -137,12 +137,14 @@
             throw new GlobleException("请选择服务");
         }
         SysVipInfo vipInfo = sysVipInfoService.findById(serviceOrderDto.getVipId());
-        if (StringUtils.isBlank(vipInfo.getPassWord())) {
-            return AjaxResult.buildFailInstance("未设置资金密码");
-        }
+//        if (StringUtils.isBlank(vipInfo.getPassWord())) {
+//            return AjaxResult.buildFailInstance("未设置资金密码");
+//        }
 
-        if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
-            return AjaxResult.buildSuccessInstance("资金密码错误");
+        if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
+            if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
+                return AjaxResult.buildFailInstance("资金密码错误");
+            }
         }
 
         SysProjServices sysProjServices = new SysProjServices();

--
Gitblit v1.9.1