From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
index 3aad1e8..696e9aa 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
@@ -1,7 +1,7 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.biz.dao.BizUserDao;
+import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.component.tools.WxacodeUtil;
import com.matrix.core.pojo.AjaxResult;
@@ -72,7 +72,7 @@
ShopActivitiesGroupInfoDao shopActivitiesGroupInfoDao;
@Autowired
- BizUserDao bizUserDao;
+ SysVipInfoDao sysVipInfoDao;
@Autowired
@@ -94,8 +94,8 @@
@RequestMapping(value = "/getProductShareQrcode")
public @ResponseBody
AjaxResult getwxacode1(@RequestBody QrcodeVo qrcodeVo) throws Exception {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- loginUser = bizUserDao.selectById(loginUser.getUserId());
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ loginUser = sysVipInfoDao.selectById(loginUser.getId());
//活动类型
ShopActivities activities=null;
//是否为拼团分享
@@ -166,7 +166,7 @@
* @param qrcodeVo
* @return
*/
- private QrcodeImgParam getSeckillQrcodeImgParam(BizUser loginUser, QrcodeVo qrcodeVo) throws Exception {
+ private QrcodeImgParam getSeckillQrcodeImgParam(SysVipInfo loginUser, QrcodeVo qrcodeVo) throws Exception {
ShopActivitiesSeckillInfo seckillInfo = shopActivitiesSeckillInfoDao.selectById(qrcodeVo.getSkillId());
@@ -205,7 +205,7 @@
* @param qrcodeVo
* @return
*/
- private QrcodeImgParam getGroupQrcodeImgParam(BizUser loginUser, QrcodeVo qrcodeVo) throws Exception {
+ private QrcodeImgParam getGroupQrcodeImgParam(SysVipInfo loginUser, QrcodeVo qrcodeVo) throws Exception {
WxActivitiesGroupBuyVO groupBuyVO = shopActivitiesGroupInfoDao.selectGroupInfoWithPriceByActId(qrcodeVo.getActId());
@@ -238,7 +238,7 @@
}
@NotNull
- private QrcodeImgParam getQrcodeImgParam(BizUser loginUser, QrcodeVo qrcodeVo) throws Exception {
+ private QrcodeImgParam getQrcodeImgParam(SysVipInfo loginUser, QrcodeVo qrcodeVo) throws Exception {
ShopProduct shopProduct = shopProductDao.selectById(qrcodeVo.getProductId());
--
Gitblit v1.9.1