From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java
index d04b001..f1f9732 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java
@@ -1,9 +1,9 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.system.hive.bean.SysVipInfo;
-import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.component.tools.WxacodeUtil;
import com.matrix.core.pojo.AjaxResult;
+import com.matrix.system.common.init.UserCacheManager;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.shopXcx.api.WeChatApiTools;
import com.matrix.system.shopXcx.bean.ShopWxAcode;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,9 +22,12 @@
@RequestMapping(value = "wxapi/getAcode")
public class WxGetAcodeAction {
@Autowired
- private RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
WeChatApiTools weChatApiTools;
+
+ @Autowired
+ WxacodeUtil wxacodeUtil;
/**
* 获取微信二维码
* @param
@@ -33,10 +36,10 @@
@PostMapping("/getWxAcode")
@ResponseBody
public AjaxResult getWxAcode(@RequestBody ShopWxAcode wxAcode) {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
String openId = loginUser.getOpenId();
try {
- String wxacodeUrl = WxacodeUtil.getWxacode(wxAcode.getScene(), wxAcode.getPage(), wxAcode.getFileName(),
+ String wxacodeUrl = wxacodeUtil.getWxacode(wxAcode.getScene(), wxAcode.getPage(), wxAcode.getFileName(),
weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
String substring = wxacodeUrl.substring(0, 5);
if("error".equals(substring)){
--
Gitblit v1.9.1