首页

ch-core/src/main/java/com/wwdz/ch/core/util/CacheUtil.java

@@ -31,13 +31,11 @@ public class CacheUtil {
     DtsAdminDao dtsAdminDao;
 
     @Autowired
-    DtsUserDao dtsUserDao;
+    UserDao userDao;
 
     @Autowired
     CategoryDao categoryDao;
 
-    @Autowired
-    UserDao userDao;
 
     @Autowired
     AiAssistantDao aiAssistantDao;
@@ -151,7 +149,7 @@ public class CacheUtil {
      * @return
      */
     public String getAppletUserList(long key) {
-        User user = dtsUserDao.findById(key);
+        User user = userDao.queryById(key);
         return user.getNickname();
        /* List<User> userList = dtsUserDao.findAll();
         Map<Long, String> map = userList.stream().collect(Collectors.toMap(User::getId, User::getNickname, (k1, k2) -> k2));
@@ -170,7 +168,7 @@ public class CacheUtil {
      * @return
      */
     public String getAppletUserPhoneList(long key) {
-        User user = dtsUserDao.findById(key);
+        User user = userDao.queryById(key);
         return user.getMobile();
        /* List<User> userList = dtsUserDao.findAll();
         Map<Long, String> map = userList.stream().collect(Collectors.toMap(User::getId, User::getNickname, (k1, k2) -> k2));
@@ -184,7 +182,7 @@ public class CacheUtil {
      * @return
      */
     public User getAppletUsers(long key) {
-        User user = dtsUserDao.findById(key);
+        User user = userDao.queryById(key);
         return user;
        /* List<User> userList = dtsUserDao.findAll();
         Map<Long, User> map = userList.stream().collect(Collectors.toMap(User::getId, Function.identity(), (k1, k2) -> k2));

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

@@ -91,16 +91,16 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         criteria.andTypeIn(dto.getTypeList());
         criteria.andStockGreaterThan(0);
         criteria.andIsDeletedEqualTo(false);
-        criteria.andIsOnSaleEqualTo(true);
+      //  criteria.andIsOnSaleEqualTo(true);
         if (!CollectionUtils.isEmpty(dto.getIds())) {
             SupplierItemExample.Criteria orCriteria = supplierItemExample.or();
             JdbcHelper.ifPresent(dto.getIds(), orCriteria::andIdIn);
             orCriteria.andTypeIn(dto.getTypeList());
             orCriteria.andStockGreaterThan(0);
             orCriteria.andIsDeletedEqualTo(false);
-            orCriteria.andIsOnSaleEqualTo(true);
+        //    orCriteria.andIsOnSaleEqualTo(true);
         }
-        supplierItemExample.setOrderByClause(" update_time desc");
+        supplierItemExample.setOrderByClause(" create_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return supplierItemMapper.selectByExampleWithBLOBs(supplierItemExample);
     }

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

@@ -13,6 +13,7 @@ import com.wwdz.ch.db.mapper.ex.StatMapper;
 import com.wwdz.mall.common.vo.response.CloudServerResponse;
 import com.wwdz.user.api.service.user.UserReadService;
 import com.wwdz.user.api.service.user.UserWriteService;
+import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -21,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@Service
+@Repository
 public class DtsUserDaoImpl implements DtsUserDao {
 	
 	@Resource

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

@@ -12,10 +12,13 @@ import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.MediaUtil;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.StringUtil;
+import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.dao.SwitchDao;
 import com.wwdz.ch.db.dao.distribution.*;
+import com.wwdz.ch.db.domain.FollowFansRecord;
 import com.wwdz.ch.db.domain.Switch;
 import com.wwdz.ch.db.domain.distribution.*;
+import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.*;
 import com.wwdz.ch.core.entity.SupplierItemVo;
 import com.wwdz.ch.wx.entity.vo.distribution.AuctionDetailVo;
@@ -101,7 +104,11 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     CollectionShareRecordDao collectionShareRecordDao;
 
     @Autowired
-    private QiniuStorage qiniuStorage;
+    QiniuStorage qiniuStorage;
+
+    @Autowired
+    FollowFansRecordDao followFansRecordDao;
+
 
 
     @Override
@@ -754,36 +761,21 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             //用户默认展示逍遥分享的商品列表
             long sellerId = 291997;
             SupplierItemRequestDto searchDto = new SupplierItemRequestDto();
-            //查询用户的历史浏览记录
-            List<UserRecentBrowse> userRecentBrowseList = userRecentBrowseDao.findByUserId(userId);
-            //浏览记录是平台商品的
-            List<Long> sharedUserIdList = userRecentBrowseList.stream().map(UserRecentBrowse::getSharedUserId).collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(sharedUserIdList)) {
-                sharedUserIdList.add(sellerId);
-            }
-            searchDto.setCreatorIdList(sharedUserIdList);
-            DistributorShareRecordRequestDto distributorShareRecordRequestDto = new DistributorShareRecordRequestDto();
-            distributorShareRecordRequestDto.setDistributorIdList(sharedUserIdList);
-            distributorShareRecordRequestDto.setType(dto.getType());
-            List<DistributorShareRecord> distributorShareRecordList = distributorShareRecordDao.find(distributorShareRecordRequestDto);
-
-            //平台商品被分享出去对应的分销商的所有分享商品
-            List<Long> distributorShareItemIds = distributorShareRecordList.stream().filter(StringUtil.distinctByKey(DistributorShareRecord::getItemId)).map(DistributorShareRecord::getItemId).collect(Collectors.toList());
-
-            //浏览记录是用户上传的
-           /* List<Long> uploadUserIdList = userRecentBrowseList.stream().filter(a -> a.getType() == DistributionEnum.UserBrowseTypeEnum.USER_ITEM.getCode()).map(UserRecentBrowse::getSharedUserId).collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(uploadUserIdList)) {
-                uploadUserIdList.add(sellerId);
-            }*/
-            searchDto.setIds(distributorShareItemIds);
-            Map<Long, DistributorShareRecord> map = distributorShareRecordList.stream().collect(Collectors.toMap(DistributorShareRecord::getItemId, Function.identity(), (k1, k2) -> k1));
-            searchDto.setIsOnSale(true);
+            //查询用户关注的人
+            FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+            followFansRecordRequestDto.setFansId(userId);
+            List<FollowFansRecord> followFansRecordList = followFansRecordDao.findList(followFansRecordRequestDto);
+            List<Long> followerIds = followFansRecordList.stream().map(FollowFansRecord::getFollowerId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(followerIds)) {
+                followerIds.add(sellerId);
+            }
             searchDto.setIsDeleted(false);
             if (dto.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
                 searchDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.COLLECT.getCode()));
             } else {
                 searchDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.AUCTION.getCode()));
             }
+            searchDto.setCreatorIdList(followerIds);
             searchDto.setStock(0);//库存大于0
             searchDto.setPage(dto.getPage());
             searchDto.setLimit(dto.getLimit());
@@ -796,7 +788,6 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 supplierItemVo.setItemId(supplierItem.getId());
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
-                supplierItemVo.setShareId(map.get(supplierItem.getId())== null?"":map.get(supplierItem.getId()).getShareId());
                 supplierItemVo.setCreatorName(cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getNickname());
                 supplierItemVo.setCreatorAvatar(cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getAvatar());