From 58032b964fa5dee3924847943548093af6dcb098 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 28 Oct 2021 10:32:24 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesLuckydrawAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesLuckydrawAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesLuckydrawAction.java
index c54e9ac..6cc7a00 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesLuckydrawAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesLuckydrawAction.java
@@ -7,7 +7,7 @@
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.matrix.component.redis.RedisUserLoginUtils;
+import com.matrix.system.common.init.UserCacheManager;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.activity.dao.ActivitySignAwardSetDao;
@@ -54,7 +54,7 @@
private ShopActivitiesDao shopActivitiesDao;
@Autowired
- private RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
private ActivitySignAwardSetDao activitySignAwardSetDao;
@@ -96,7 +96,7 @@
@GetMapping(value = "/getLuckydrawBasicInfo")
public AjaxResult getLuckydrawBasicInfo() {
//获取登录人信息
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
Long companyId = loginUser.getCompanyId();
Long userId = loginUser.getId();
//获取抽奖活动的信息
@@ -164,7 +164,7 @@
@ResponseBody
@Transactional
public AjaxResult clickLuckyDraw(@PathVariable("actId") long actId) {
- SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo user = userCacheManager.getLoginUser();
Long userId = user.getId();
Long companyId = user.getCompanyId();
/**
@@ -503,7 +503,7 @@
@GetMapping(value = "scoreLuckyDraw/{actId}")
@ResponseBody
public AjaxResult logisticsInsureById(@PathVariable("actId") Long actId) {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
Long userId = loginUser.getId();
Long companyId = loginUser.getCompanyId();
//获取用户总积分
--
Gitblit v1.9.1