Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCollectionAction.java

@@ -1,9 +1,8 @@
package com.matrix.system.shopXcx.api.action;

import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.common.init.UserCacheManager;
import com.matrix.system.hive.bean.SysVipInfo;

import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.shopXcx.bean.ShopCollection;
import com.matrix.system.shopXcx.dao.ShopCollectionDao;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,7 @@
    @Autowired
    private ShopCollectionDao collectionDao;
    @Autowired
    private RedisUserLoginUtils redisUserLoginUtils;
    private UserCacheManager userCacheManager;

    /**
     * 接收保存收藏数据
@@ -35,7 +34,7 @@
    @PostMapping(value = "/saveCollection")
    public @ResponseBody
    AjaxResult saveCollection(@RequestBody ShopCollection collection) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        collection.setCreateBy(loginUser.getOpenId());
        collection.setUpdateBy(loginUser.getOpenId());
        collection.setCollUserid(loginUser.getOpenId());
@@ -72,7 +71,7 @@
    @ResponseBody
    public AjaxResult deleteByProductId(@PathVariable("collProductid") Integer collProductid){
        Map<String, Object> deleteMap = new HashMap<>();
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        String collUserid = loginUser.getOpenId();
        deleteMap.put("collProductid", collProductid);
        deleteMap.put("collUserid", collUserid);
@@ -91,7 +90,7 @@
    @PostMapping("/findCollection")
    @ResponseBody
    public AjaxResult getCollectionByUserId(@RequestBody ShopCollection collection) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        String userId = loginUser.getOpenId();
        collection.setCollUserid(userId);
        List<ShopCollection> list = collectionDao.selectByUserId(collection);
@@ -107,7 +106,7 @@
    @PostMapping("/findByUserIdAndProid/{collProductid}")
    @ResponseBody
    public AjaxResult findByUserIdAndProid(@PathVariable("collProductid") Integer collProductid) {
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo loginUser = userCacheManager.getLoginUser();
        String userId = loginUser.getOpenId();
        List<ShopCollection> list = collectionDao.selectByUserIdAndProid(collProductid,userId);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, list, list.size());