Merge remote-tracking branch 'origin/quanku_v3.4' into quanku_v3.5

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

@@ -57,6 +57,12 @@ public interface SupplierItemDao {
      */
     SupplierItem findById(long itemId);
 
+    /**
+     * 查询置顶商品
+     * @return
+     */
+    SupplierItem findTopItem();
+
 
     int update(SupplierItem supplierItem);
 

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

@@ -127,6 +127,15 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         return supplierItemMapper.selectOneByExampleWithBLOBs(supplierItemExample);
     }
 
+
+    @Override
+    public SupplierItem findTopItem() {
+        SupplierItemExample supplierItemExample = new SupplierItemExample();
+        SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
+        criteria.andSortEqualTo(-100);
+        return supplierItemMapper.selectOneByExampleWithBLOBs(supplierItemExample);
+    }
+
     @Override
     public int update(SupplierItem supplierItem) {
         supplierItem.setUpdateTime(new Date());
@@ -176,6 +185,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         criteria.andTypeIn(dto.getTypeList());
         criteria.andStockGreaterThan(0);
         criteria.andIsDeletedEqualTo(false);
+        criteria.andSortNotEqualTo(-100);
         JdbcHelper.ifPresent(dto.getFilterIds(), criteria::andIdNotIn);
       //  criteria.andIsOnSaleEqualTo(true);
         if (!CollectionUtils.isEmpty(dto.getIds())) {
@@ -184,6 +194,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
             orCriteria.andTypeIn(dto.getTypeList());
             orCriteria.andStockGreaterThan(0);
             orCriteria.andIsDeletedEqualTo(false);
+            criteria.andSortNotEqualTo(-100);
         //    orCriteria.andIsOnSaleEqualTo(true);
         }
     //    supplierItemExample.setOrderByClause(" create_time desc");

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

@@ -1273,6 +1273,10 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             searchDto.setPage(1);
             List<SupplierItem> supplierItemList = supplierItemDao.findForHomePage(searchDto);
             PageInfo<SupplierItem> pageInfo = new PageInfo(supplierItemList);
+            SupplierItem topSupplierItem = supplierItemDao.findTopItem();
+            if (topSupplierItem != null) {
+                supplierItemList.add(0, topSupplierItem);
+            }
             List<Long> filterItemIds = supplierItemList.stream().map(SupplierItem::getId).collect(Collectors.toList());
             if (redisUtils.hasKey(viewKey)) {
                 List<Long> searchItemIds = (List<Long>) redisUtils.get(viewKey);
@@ -1281,6 +1285,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             } else {
                 redisUtils.set(viewKey, filterItemIds, 60 * 60 * 2);
             }
+
             Date now = new Date();
             supplierItemList.forEach(supplierItem -> {
                 SupplierItemVo supplierItemVo = new SupplierItemVo();