From cf955aaa918244fdf1f2fd8367e01d2535f0c108 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jan 2021 16:08:07 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java       |    2 +-
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |    1 +
 2 files changed, 2 insertions(+), 1 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..59424ef 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
@@ -142,7 +142,7 @@
         }
 
         if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
-            return AjaxResult.buildSuccessInstance("资金密码错误");
+            return AjaxResult.buildFailInstance("资金密码错误");
         }
 
         SysProjServices sysProjServices = new SysProjServices();
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index b9db73c..75f839a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -575,6 +575,7 @@
 		vipInfoDetailVo.setBirthday(sysVipInfo.getBirthday1());
 		vipInfoDetailVo.setPassword(sysVipInfo.getPassWord());
 		vipInfoDetailVo.setPhoto(sysVipInfo.getPhoto());
+		vipInfoDetailVo.setVipNo(sysVipInfo.getVipNo());
 
 		List<SysVipLabel> labels = sysVipLabelDao.selectByVipId(sysVipInfo.getId());
 		vipInfoDetailVo.setLabels(labels);

--
Gitblit v1.9.1