修改我的列表被删除商品相关逻辑

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsServiceImpl.java

@@ -534,10 +534,13 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     @Override
     public IPage<SecondGoodsVo> getShieldedGoodsPage(IPage<SecondGoodsVo> page, Integer userId) {
         QueryWrapper<SecondGoodsVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
+        queryWrapper
+                // 可以查看已删除的商品数据
+//                .eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("ss.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("ss.user_id", userId)
-                .eq("ss.shield_type", 1);
+                .eq("ss.shield_type", 1)
+                .orderByDesc("ss.created_time");
         return secondGoodsMapper.getShieldedGoodsPage(page, queryWrapper);
 
     }
@@ -552,9 +555,12 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     public IPage<SecondGoodsVo> getCollectGoodsPage(IPage<SecondGoodsVo> page, int userId) {
         LifeUser lifeUser = lifeUserMapper.selectById(userId);
         QueryWrapper<SecondGoodsVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
+        queryWrapper
+                // 可以查看已删除的商品数据
+//                .eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("lc.delete_flag", Constants.DeleteFlag.NOT_DELETED)
-                .eq("lc.user_id", "user_"+lifeUser.getUserPhone());
+                .eq("lc.user_id", "user_"+lifeUser.getUserPhone())
+                .orderByDesc("lc.created_time");
         return secondGoodsMapper.getCollectGoodsPage(page, queryWrapper);
     }
 
@@ -567,10 +573,13 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     @Override
     public IPage<SecondGoodsVo> getBuyGoodsPage(IPage<SecondGoodsVo> page, int userId) {
         QueryWrapper<SecondGoodsVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
+        queryWrapper
+                // 可以查看已删除的商品数据
+//                .eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("str.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("str.buyer_id", userId) // 买家ID
-                .eq("str.trade_status", Constants.TradeStatus.SUCCESS); // 1-交易成功
+                .eq("str.trade_status", Constants.TradeStatus.SUCCESS) // 1-交易成功
+                .orderByDesc("str.created_time");
         return secondGoodsMapper.getBuyGoodsPage(page, queryWrapper);
     }
 
@@ -637,7 +646,8 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
         QueryWrapper<SecondGoodsVo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("sg.user_id", userId) // 用户ID
-                .eq("sg.goods_status", SecondGoodsStatusEnum.DRAFT.getCode());
+                .eq("sg.goods_status", SecondGoodsStatusEnum.DRAFT.getCode())
+                .orderByDesc("sg.created_time");
         return secondGoodsMapper.getDraftList(page, queryWrapper);
     }
 
@@ -651,11 +661,14 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     @Override
     public IPage<SecondGoodsVo> getLikeGoodsPage(IPage<SecondGoodsVo> page, int userId, String phone) {
         QueryWrapper<SecondGoodsVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
+        queryWrapper
+                // 可以查看已删除的商品数据
+//                .eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("lc.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("lc.dianzan_id", "user_"+phone)
                 .eq("lc.type", Constants.LikeType.SECOND_HAND_GOODS) // 6-二手商品
-                .eq("sg.user_id", userId); // 用户ID
+                .eq("sg.user_id", userId) // 用户ID
+                .orderByDesc("lc.created_time");
         return secondGoodsMapper.getLikeGoodsPage(page, queryWrapper);
     }
 
@@ -669,11 +682,14 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
     public IPage<SellGoodsVo> getTransactionList(IPage<SellGoodsVo> page, Integer userId) {
         IPage<SellGoodsVo> result = new Page<>();
         QueryWrapper<SellGoodsVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
+        queryWrapper
+                // 可以查看已删除的商品数据
+//                .eq("sg.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .eq("str.delete_flag", Constants.DeleteFlag.NOT_DELETED)
                 .and(wrapper -> wrapper.eq("str.buyer_id", userId)
                         .or()
-                        .eq("str.seller_id", userId)).orderByDesc("str.created_time");
+                        .eq("str.seller_id", userId))
+                .orderByDesc("str.created_time");
         result = secondGoodsMapper.getTransactionList(page, userId, queryWrapper);
         // 批量设置用户信息
         batchSetSellUserInfo(result);