From 7883486d235deaf144d42f9964f8aa18d864161e Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Apr 2022 21:49:34 +0800
Subject: [PATCH] feat:商品资料导出新增时长字段
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
index ee68131..4691ceb 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
@@ -158,6 +158,7 @@
@RequestMapping(value = "/findUserInfo")
public @ResponseBody
AjaxResult findUserInfo() {
+ AjaxResult res = new AjaxResult();
SysVipInfo loginUser = userCacheManager.getLoginUser();
SysVipInfo sysVipInfo = sysVipInfoService.findById(loginUser.getId());
@@ -169,20 +170,19 @@
sysVipInfo.setBalance(0D);
sysVipInfo.setPointAll(0);
}
- }
- AjaxResult res = new AjaxResult();
- res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId()));
- res.putInMap("prizeCount", activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(), loginUser.getCompanyId()));
- res.putInMap("userInfo", sysVipInfo);
- //查询会员等级
- if (sysVipInfo.getSalesmanGrade() != null) {
- ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade());
- res.putInMap("vipLevel", shopSalesmanGrade.getName());
- } else if (sysVipInfo.getVipLevel() != null) {
- res.putInMap("vipLevel", sysVipInfo.getVipLevel().getLevelName());
- } else {
- res.putInMap("vipLevel", "初级会员");
+ res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId()));
+ res.putInMap("prizeCount", activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(), loginUser.getCompanyId()));
+ res.putInMap("userInfo", sysVipInfo);
+ //查询会员等级
+ if (sysVipInfo.getSalesmanGrade() != null) {
+ ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade());
+ res.putInMap("vipLevel", shopSalesmanGrade.getName());
+ } else if (sysVipInfo.getVipLevel() != null) {
+ res.putInMap("vipLevel", sysVipInfo.getVipLevel().getLevelName());
+ } else {
+ res.putInMap("vipLevel", "初级会员");
+ }
}
res.setStatus(AjaxResult.STATUS_SUCCESS);
return res;
--
Gitblit v1.9.1