Merge remote-tracking branch 'origin/quanku_0930' into quanku_0930

ch-core/src/main/java/com/wwdz/ch/core/consts/MessageEnum.java

@@ -102,5 +102,38 @@ public class MessageEnum {
         }
     }
 
+    public enum ContentTextEnum {
+        ITEM_SHARE(1, "分享了您的藏品"),
+        ITEM_COLLECT(2, "收藏了您的藏品"),
+        FAVORITES_SHARE(3, "分享了您的收藏册"),
+        FAVORITES_COLLECT(3, "收藏了您的收藏册"),
+        ;
+
+        private int code;
+        private String des;
+
+        ContentTextEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+            for (ContentTextEnum contentTextEnum : ContentTextEnum.values()) {
+                if (code == contentTextEnum.getCode()) {
+                    return contentTextEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+    }
+
 
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/FootPrintDao.java

@@ -39,7 +39,7 @@ public interface FootPrintDao {
      * @param itemIds
      * @return
      */
-    long countByItemIds(Long itemId, List<Long> itemIds);
+    long countByItemIds(Long userId, Long itemId, List<Long> itemIds);
 
     /**
      * 批量删除记录

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserCollectBrowseNumDao.java

+package com.wwdz.ch.db.dao;
+
+import com.wwdz.ch.db.domain.UserCollectBrowseNum;
+
+public interface UserCollectBrowseNumDao {
+    UserCollectBrowseNum findByUserId(Long userId);
+    int insert(UserCollectBrowseNum record);
+    int update(UserCollectBrowseNum record);
+}

ch-dao/src/main/java/com/wwdz/ch/db/domain/UserCollectBrowseNum.java

+package com.wwdz.ch.db.domain;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @author shiyu
+ * @date   2023/09/22
+ */
+@Data
+public class UserCollectBrowseNum implements Serializable {
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 被收藏数
+     */
+    private Integer collectNum;
+
+    /**
+     * 被浏览量
+     */
+    private Integer browseNum;
+
+    /**
+     * 创建时间
+     */
+    private Date addTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", collectNum=").append(collectNum);
+        sb.append(", browseNum=").append(browseNum);
+        sb.append(", addTime=").append(addTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        UserCollectBrowseNum other = (UserCollectBrowseNum) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getCollectNum() == null ? other.getCollectNum() == null : this.getCollectNum().equals(other.getCollectNum()))
+            && (this.getBrowseNum() == null ? other.getBrowseNum() == null : this.getBrowseNum().equals(other.getBrowseNum()))
+            && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getCollectNum() == null) ? 0 : getCollectNum().hashCode());
+        result = prime * result + ((getBrowseNum() == null) ? 0 : getBrowseNum().hashCode());
+        result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        return result;
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table user_collect_browse_num
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public enum Column {
+        id("id", "id", "INTEGER", false),
+        userId("user_id", "userId", "BIGINT", false),
+        collectNum("collect_num", "collectNum", "INTEGER", false),
+        browseNum("browse_num", "browseNum", "INTEGER", false),
+        addTime("add_time", "addTime", "TIMESTAMP", false),
+        updateTime("update_time", "updateTime", "TIMESTAMP", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String BEGINNING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String ENDING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public static Column[] excludes(Column ... excludes) {
+            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table user_collect_browse_num
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+    }
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/impl/FootPrintDaoImpl.java

@@ -58,11 +58,12 @@ public class FootPrintDaoImpl implements FootPrintDao {
     }
 
     @Override
-    public long countByItemIds(Long itemId, List<Long> itemIds) {
+    public long countByItemIds(Long userId, Long itemId, List<Long> itemIds) {
         FootprintExample example = new FootprintExample();
         FootprintExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(itemId, criteria::andItemIdEqualTo);
         JdbcHelper.ifPresent(itemIds, criteria::andItemIdIn);
+        JdbcHelper.ifPresent(userId, criteria::andUserIdNotEqualTo);
         criteria.andDeletedEqualTo(false);
         return footprintMapper.countByExample(example);
     }

ch-dao/src/main/java/com/wwdz/ch/db/impl/UserCollectBrowseNumDaoImpl.java

+package com.wwdz.ch.db.impl;
+
+import com.wwdz.ch.db.dao.UserCollectBrowseNumDao;
+import com.wwdz.ch.db.domain.UserCollectBrowseNum;
+import com.wwdz.ch.db.domain.UserCollectBrowseNumExample;
+import com.wwdz.ch.db.mapper.UserCollectBrowseNumMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class UserCollectBrowseNumDaoImpl implements UserCollectBrowseNumDao {
+    @Autowired
+    private UserCollectBrowseNumMapper userCollectBrowseNumMapper;
+
+    @Override
+    public UserCollectBrowseNum findByUserId(Long userId) {
+        UserCollectBrowseNumExample example = new UserCollectBrowseNumExample();
+        UserCollectBrowseNumExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(userId);
+        return userCollectBrowseNumMapper.selectOneByExample(example);
+    }
+
+    @Override
+    public int insert(UserCollectBrowseNum record) {
+        return userCollectBrowseNumMapper.insert(record);
+    }
+
+    @Override
+    public int update(UserCollectBrowseNum record) {
+        return userCollectBrowseNumMapper.updateByPrimaryKey(record);
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserCollectBrowseNumMapper.java

+package com.wwdz.ch.db.mapper;
+
+import com.wwdz.ch.db.domain.UserCollectBrowseNum;
+import com.wwdz.ch.db.domain.UserCollectBrowseNumExample;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface UserCollectBrowseNumMapper {
+    long countByExample(UserCollectBrowseNumExample example);
+
+    int deleteByExample(UserCollectBrowseNumExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(UserCollectBrowseNum record);
+
+    int insertSelective(UserCollectBrowseNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_collect_browse_num
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    UserCollectBrowseNum selectOneByExample(UserCollectBrowseNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_collect_browse_num
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    UserCollectBrowseNum selectOneByExampleSelective(@Param("example") UserCollectBrowseNumExample example, @Param("selective") UserCollectBrowseNum.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_collect_browse_num
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    List<UserCollectBrowseNum> selectByExampleSelective(@Param("example") UserCollectBrowseNumExample example, @Param("selective") UserCollectBrowseNum.Column ... selective);
+
+    List<UserCollectBrowseNum> selectByExample(UserCollectBrowseNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_collect_browse_num
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    UserCollectBrowseNum selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") UserCollectBrowseNum.Column ... selective);
+
+    UserCollectBrowseNum selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") UserCollectBrowseNum record, @Param("example") UserCollectBrowseNumExample example);
+
+    int updateByExample(@Param("record") UserCollectBrowseNum record, @Param("example") UserCollectBrowseNumExample example);
+
+    int updateByPrimaryKeySelective(UserCollectBrowseNum record);
+
+    int updateByPrimaryKey(UserCollectBrowseNum record);
+}
\ No newline at end of file

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ItemRequestDto.java

@@ -47,4 +47,6 @@ public class ItemRequestDto implements Entity {
     private Integer loginType;
     // 查看权限(0所有人,1仅自己可见)
     private Integer viewPermission;
+    // 分享类型（0、藏品，1、收藏册，2、用户主页）
+    private Integer shareType;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

@@ -44,6 +44,8 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Autowired
     private FootPrintDao footPrintDao;
     @Autowired
+    private UserCollectBrowseNumDao userCollectBrowseNumDao;
+    @Autowired
     private ItemCommonService itemCommonService;
     @Autowired
     private UserTokenManager userTokenManager;
@@ -273,7 +275,7 @@ public class FavoritesServiceImpl implements FavoritesService {
                 itemCommonService.getNicknameAvatar(item.getId(), vo);
                 vo.setViewPermission(item.getViewPermission());
                 // 设置浏览量
-                vo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(item.getId(), null)) : "0");
+                vo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(vo.getItemUserId(), item.getId(), null)) : "0");
 
                 // 设置图片或视频
                 vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
@@ -364,6 +366,19 @@ public class FavoritesServiceImpl implements FavoritesService {
             // 更新收藏册id
             favoritesItemsRelationDao.updateFavoritesId(favorites.getUserId(), dto.getFavoritesId(), dto.getItemIds());
 
+            // 更新藏品发布者的收藏数
+            for (Long itemId : dto.getItemIds()) {
+                UserItemsRelation userItemsRelation = userItemsRelationDao.find(itemId);
+                if (Objects.nonNull(userItemsRelation)) {
+                    UserCollectBrowseNum userCollectBrowseNum = userCollectBrowseNumDao.findByUserId(userItemsRelation.getUserId());
+                    if (Objects.nonNull(userCollectBrowseNum)) {
+                        userCollectBrowseNum.setCollectNum(userCollectBrowseNum.getCollectNum() + 1);
+                        userCollectBrowseNum.setUpdateTime(new Date());
+                        userCollectBrowseNumDao.update(userCollectBrowseNum);
+                    }
+                }
+            }
+
             // 更新收藏册操作时间
             favoritesDao.updateTime(dto.getFavoritesId(), null);
             logger.info("【请求结束】收藏藏品成功");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemCommonServiceImpl.java

@@ -3,10 +3,7 @@ package com.wwdz.ch.wx.impl;
 import com.wwdz.ch.core.consts.ViewPermissionEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.*;
-import com.wwdz.ch.db.domain.Item;
-import com.wwdz.ch.db.domain.ItemsOfficialUsersRelation;
-import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.domain.UserItemsRelation;
+import com.wwdz.ch.db.domain.*;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.wx.dao.UserInfo;
@@ -19,6 +16,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -38,6 +36,8 @@ public class ItemCommonServiceImpl implements ItemCommonService {
     private UserDao userDao;
     @Autowired
     private ItemDao itemDao;
+    @Autowired
+    private UserCollectBrowseNumDao userCollectBrowseNumDao;
 
     @Autowired
     private UserTokenManager userTokenManager;
@@ -85,18 +85,42 @@ public class ItemCommonServiceImpl implements ItemCommonService {
             followersNumber = (long) map.get("followerNum");
             fansNumber = (long) map.get("fansNum");
         }
-        // 收藏和浏览量、所有人私密数量
+        UserCollectBrowseNum userCollectBrowseNum = userCollectBrowseNumDao.findByUserId(userInfo.getUserId());
+        // 所有人私密数量
         List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(userInfo.getUserId(), null);
         if (CollectionUtils.isNotEmpty(userItemsRelations)) {
             List<Long> itemIds = userItemsRelations.stream()
                     .map(UserItemsRelation::getItemId).collect(Collectors.toList());
-            collectionsNumber = favoritesItemsRelationDao.countByItemIds(itemIds);
-            viewsNumber = footPrintDao.countByItemIds(null, itemIds);
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setIds(itemIds);
             List<Item> itemList = itemDao.findListNotDeleted(coinRequestDto);
-            allNumber = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ALL.getCode())).count();
+            List<Item> allItemList = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ALL.getCode())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(allItemList)) {
+                allNumber = allItemList.size();
+                // 初始浏览量
+                if (Objects.isNull(userCollectBrowseNum)) {
+                    viewsNumber = footPrintDao.countByItemIds(userInfo.getUserId(), null, allItemList.stream().map(Item::getId).collect(Collectors.toList()));
+                }
+            }
             privacyNumber = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ONLY_ONESELF.getCode())).count();
+            // 初始收藏量
+            if (Objects.isNull(userCollectBrowseNum)) {
+                collectionsNumber = favoritesItemsRelationDao.countByItemIds(itemIds);
+            }
+        }
+        // 收藏和浏览量
+        if (Objects.isNull(userCollectBrowseNum)) {
+            UserCollectBrowseNum record = new UserCollectBrowseNum();
+            record.setUserId(userInfo.getUserId());
+            record.setCollectNum(Integer.parseInt(String.valueOf(collectionsNumber)));
+            record.setBrowseNum(Integer.parseInt(String.valueOf(viewsNumber)));
+            Date date = new Date();
+            record.setAddTime(date);
+            record.setUpdateTime(date);
+            userCollectBrowseNumDao.insert(record);
+        } else {
+            collectionsNumber= Long.parseLong(userCollectBrowseNum.getCollectNum().toString());
+            viewsNumber =Long.parseLong(userCollectBrowseNum.getBrowseNum().toString());
         }
 
         userInfo.setCollectionsNumber(collectionsNumber);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -410,7 +410,7 @@ public class UserServiceImpl implements UserService {
                     userInfo.setFollowedId((Integer) map.get("id"));
                 }
             }
-
+            itemCommonService.getPageViews(userInfo);
             logger.info("【请求结束】查询用户信息（客态）成功");
             return Result.success(userInfo);
         } catch (Exception e) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ItemService.java

@@ -5,7 +5,6 @@ import com.wwdz.ch.wx.entity.request.ItemRequestDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public interface ItemService {
     /**
@@ -93,18 +92,22 @@ public interface ItemService {
      *
      * @param page
      * @param scene
-     * @param response
+     * @param loginType
+     * @param request
      * @return
      */
-    Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request, HttpServletResponse response);
+    Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request);
 
     /**
      * 获取小程序链接
      *
      * @param pageUrl
+     * @param loginType
+     * @param shareType
+     * @param request
      * @return
      */
-    Result getLink(String pageUrl, Integer loginType, HttpServletRequest request);
+    Result getLink(String pageUrl, Integer loginType, Integer shareType, HttpServletRequest request);
 
     /**
      * 上传图片

ch-wx-api/src/main/java/com/wwdz/ch/wx/util/StringUtil.java

@@ -70,4 +70,8 @@ public class StringUtil {
     public static String formatMessageKey(long sendId, int type, long receiverId) {
         return "" + sendId + ":" + type + ":" + receiverId;
     }
+
+    public static String formatCollectMessageKey(long sendId, int type, long receiverId, int idType, long id) {
+        return "" + sendId + ":" + type + ":" + receiverId + ":" + idType + ":" + id;
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxItemController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -176,7 +175,7 @@ public class WxItemController {
 
     @ApiOperation(value = "小程序码")
     @GetMapping("/getAcode")
-    public Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request, HttpServletResponse response) {
+    public Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request) {
         logger.info("【请求开始】获小程序码,请求参数:{}", "page=" + page + ",scene=" + scene + ",loginType=" + loginType);
         if (StringUtils.isBlank(page)) {
             return Result.failed("页面路径不能为空");
@@ -187,7 +186,7 @@ public class WxItemController {
         if (Objects.isNull(loginType)) {
             return Result.failed("请提供请求的环境类型");
         }
-        return itemService.getAcode(page, scene, loginType, request, response);
+        return itemService.getAcode(page, scene, loginType, request);
     }
 
     @ApiOperation(value = "小程序链接")
@@ -200,15 +199,18 @@ public class WxItemController {
         if (Objects.isNull(dto.getLoginType())) {
             return Result.failed("请提供请求的环境类型");
         }
-        return itemService.getLink(dto.getPageUrl(), dto.getLoginType(), request);
+        if (Objects.isNull(dto.getShareType())) {
+            return Result.failed("请提供分享类型");
+        }
+        return itemService.getLink(dto.getPageUrl(), dto.getLoginType(), dto.getShareType(), request);
     }
 
     @ApiOperation(value = "分享发送消息")
     @PostMapping("/shareSendMessage")
     public Result shareSendMessage(@RequestBody ItemRequestDto dto, HttpServletRequest request) {
         logger.info("【请求开始】分享发送消息,请求参数:{}", JSON.toJSONString(dto));
-        if (Objects.isNull(dto.getItemId())) {
-            return Result.failed("请选择被分享的藏品");
+        if (Objects.isNull(dto.getId())) {
+            return Result.failed("请选择被分享的对象");
         }
         return itemService.shareSendMessage(dto, request);
     }