From e971ea090aa1f320f3c3f78c3a2a8d50f16dd4d0 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 15 Jan 2021 23:38:19 +0800
Subject: [PATCH] 小程序预约接口修改
---
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index fd508ef..69717d5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -22,6 +22,7 @@
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
+import com.matrix.system.hive.dao.SysVipLabelDao;
import com.matrix.system.hive.dao.VipAnswerDao;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.RegisterInfo;
@@ -76,10 +77,15 @@
private MoneyCardUseDao moneyCardUseDao;
@Autowired
+ private SysVipLabelDao sysVipLabelDao;
+
+ @Autowired
private SystemDictionaryService dataDictionaryService;
@Autowired
private CustomerDataDictionaryDao customerDataDictionaryDao;
+ @Resource
+ private SysOrderService sysOrderService;
@RequestMapping(value = "/showVipLevel")
@@ -124,6 +130,7 @@
List<SysVipInfo> vips = vipInfoService.findByVipNoOrTel(keyWord);
if (vips.size() > 0) {
// 在session存放当前查询的客户
+ vips.get(0).setSysOrder(sysOrderService.findSysOrderTjByVipId(vips.get(0).getId()));
vips.get(0).setLevelCard(cardUseService.findByVipId(vips.get(0).getId()));
WebUtil.getSession().setAttribute(SystemConstance.CURRENT_CUSTOMER, vips.get(0));
// 满20后删除一个
@@ -140,6 +147,8 @@
if (isNoRepeat) {
userList.add(vips.get(0));
}
+ vips.get(0).setLabels(sysVipLabelDao.selectByVipId(vips.get(0).getId()));
+ vips.get(0).setAge(DateUtil.getAgeForBirthDay(vips.get(0).getBirthday1()));
vips.get(0).setBalance(moneyCardUseDao.selectVipCardTotalMoney(vips.get(0).getId()));
AjaxResult result= new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
return result;
--
Gitblit v1.9.1