From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 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 6abbed1..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
@@ -1,8 +1,10 @@
package com.matrix.system.shopXcx.api.action;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.matrix.component.redis.RedisUserLoginUtils;
+import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.init.UserCacheManager;
import com.matrix.component.tools.HttpCurlUtil;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
@@ -56,7 +58,7 @@
@Autowired
BusParameterSettingsDao busParameterSettingsDao;
@Autowired
- private RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
ShopSalesmanApplyDao salesmanApplyDao;
@@ -134,7 +136,7 @@
}
// 存放redis
sysVipInfo.setLevelCard(null);
- String token = redisUserLoginUtils.saveUserInfo(sysVipInfo);
+ String token = userCacheManager.saveUserInfo(sysVipInfo);
LogUtil.info("用户token={}", token);
res.putInMap("token", token);
res.putInMap("userInfo", sysVipInfo);
@@ -156,22 +158,31 @@
@RequestMapping(value = "/findUserInfo")
public @ResponseBody
AjaxResult findUserInfo() {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- SysVipInfo sysVipInfo = sysVipInfoService.findById(loginUser.getId());
- sysVipInfo.setPointAll(scoreVipDetailDao.selectUserTotalScore(loginUser.getId()));
- sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId()));
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", "初级会员");
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
+ SysVipInfo sysVipInfo = sysVipInfoService.findById(loginUser.getId());
+
+ if (sysVipInfo != null) {
+ if (SysVipInfo.VALID_FLAG_Y == sysVipInfo.getValidFlag()) {
+ sysVipInfo.setBalance(moneyCardUseDao.selectVipCardTotalMoney(loginUser.getId()));
+ sysVipInfo.setPointAll(scoreVipDetailDao.selectUserTotalScore(loginUser.getId()));
+ } else {
+ sysVipInfo.setBalance(0D);
+ sysVipInfo.setPointAll(0);
+ }
+
+ 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;
@@ -199,7 +210,7 @@
public @ResponseBody
AjaxResult saveUserInfo(@RequestBody XcxUserSaveUserInfoDto xcxUserSaveUserInfoDto) {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
SysVipInfo sysVipInfo = new SysVipInfo();
sysVipInfo.setId(loginUser.getId());
@@ -227,7 +238,7 @@
if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2)
&& StringUtils.isNotBlank(sysVipInfo.getNickName())) {//目前还不是分销员
BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId());
- if (fxSwith.getParamValue().equals("1")) {//开启分销
+ if (fxSwith!=null && "1".equals(fxSwith.getParamValue())) {//开启分销
BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, loginUser.getCompanyId());
if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {//自动成为分销员
QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.1