From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCollectionAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCollectionAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCollectionAction.java
index fdbdbf6..2000ceb 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCollectionAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCollectionAction.java
@@ -1,7 +1,7 @@
package com.matrix.system.shopXcx.api.action;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.biz.bean.BizUser;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.shopXcx.bean.ShopCollection;
@@ -35,7 +35,7 @@
@PostMapping(value = "/saveCollection")
public @ResponseBody
AjaxResult saveCollection(@RequestBody ShopCollection collection) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
collection.setCreateBy(loginUser.getOpenId());
collection.setUpdateBy(loginUser.getOpenId());
collection.setCollUserid(loginUser.getOpenId());
@@ -72,7 +72,7 @@
@ResponseBody
public AjaxResult deleteByProductId(@PathVariable("collProductid") Integer collProductid){
Map<String, Object> deleteMap = new HashMap<>();
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
String collUserid = loginUser.getOpenId();
deleteMap.put("collProductid", collProductid);
deleteMap.put("collUserid", collUserid);
@@ -91,7 +91,7 @@
@PostMapping("/findCollection")
@ResponseBody
public AjaxResult getCollectionByUserId(@RequestBody ShopCollection collection) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
String userId = loginUser.getOpenId();
collection.setCollUserid(userId);
List<ShopCollection> list = collectionDao.selectByUserId(collection);
@@ -107,7 +107,7 @@
@PostMapping("/findByUserIdAndProid/{collProductid}")
@ResponseBody
public AjaxResult findByUserIdAndProid(@PathVariable("collProductid") Integer collProductid) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
String userId = loginUser.getOpenId();
List<ShopCollection> list = collectionDao.selectByUserIdAndProid(collProductid,userId);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, list, list.size());
--
Gitblit v1.9.1