屏蔽列表id 返回

alien-entity/src/main/java/shop/alien/entity/second/vo/SecondGoodsVo.java

@@ -88,6 +88,9 @@ public class SecondGoodsVo extends SecondGoods {
     @ApiModelProperty(value = "搜索入参")
     private String searchData;
 
+    @ApiModelProperty(value = "屏蔽id")
+    private String shieldId;
+
     @ApiModelProperty(value = "屏蔽商品IDList")
     private List<Integer> shieldedGoodsIds;
 

alien-entity/src/main/java/shop/alien/mapper/second/SecondGoodsMapper.java

@@ -47,7 +47,7 @@ public interface SecondGoodsMapper extends BaseMapper<SecondGoods> {
      * @param queryWrapper 查询条件
      * @return 屏蔽的商品列表
      */
-    @Select("SELECT sg.* " +
+    @Select("SELECT sg.* , ss.id as shieldId " +
             "FROM second_goods sg " +
             "INNER JOIN second_shield ss ON " +
             "(sg.id = ss.shield_id AND ss.shield_type = 1) "+
@@ -124,7 +124,7 @@ public interface SecondGoodsMapper extends BaseMapper<SecondGoods> {
             "sgc1.category_name as categoryOneName, " +
             "sgc2.category_name as categoryTwoName " +
             "FROM second_goods sg " +
-            "LEFT JOIN life_collect lc ON sg.id = lc.goods_id " +
+            "LEFT JOIN life_collect lc ON sg.id = lc.business_id " +
             "LEFT JOIN second_goods_category sgc1 " +
             "on sg.category_one_id = sgc1.id " +
             "LEFT JOIN second_goods_category sgc2 " +
@@ -261,8 +261,8 @@ public interface SecondGoodsMapper extends BaseMapper<SecondGoods> {
             "    str.transaction_latitude_longitude, " +
             "    str.transaction_location, " +
             "    str.transaction_amount, " +
-            "    str.buyer_signin, " +
-            "    str.seller_signin, " +
+            "    str.buyer_sign_in, " +
+            "    str.seller_sign_in, " +
             "    str.buyer_transaction_status, " +
             "    str.seller_transaction_status, " +
             "    str.trade_status, " +

alien-second/src/main/java/shop/alien/second/controller/SecondGoodsController.java

@@ -91,14 +91,14 @@ public class SecondGoodsController {
 
 
     /**
-     * 上架二手商品
+     * 下架二手商品
      */
     @PostMapping("/shelve")
-    @ApiOperation("上架二手商品")
-    public R<Void> shelveSecondGoods(@ApiParam("上架二手商品") @RequestBody SecondGoodsVo secondGoods) {
+    @ApiOperation("下架二手商品")
+    public R<Void> shelveSecondGoods(@ApiParam("下架二手商品") @RequestBody SecondGoodsVo secondGoods) {
         log.info("SecondGoodsController.shelveSecondGoods?secondGoods={}", secondGoods.toString());
-        // 修改商品状态为3 - 已上架
-        secondGoods.setGoodsStatus(3);
+        // 修改商品状态为4 - 已下架
+        secondGoods.setGoodsStatus(4);
         secondGoodsService.updateById(secondGoods);
         return R.success("上架成功");
     }

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

@@ -538,10 +538,11 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
      */
     @Override
     public IPage<SecondGoodsVo> getCollectGoodsPage(IPage<SecondGoodsVo> page, int userId) {
+        LifeUser lifeUser = lifeUserMapper.selectById(userId);
         QueryWrapper<SecondGoodsVo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("sg.delete_flag", 0)
                 .eq("lc.delete_flag", 0)
-                .eq("lc.user_id", userId);
+                .eq("lc.user_id", "user_"+lifeUser.getUserPhone());
         return secondGoodsMapper.getCollectGoodsPage(page, queryWrapper);
     }
 

alien-store/src/main/java/shop/alien/store/util/FileUploadUtil.java

@@ -127,6 +127,8 @@ public class FileUploadUtil {
                         File videoImgFile = new File(videoPath);
                         Map<String, String> videoImg = FileUtil.getFileNameAndType(videoImgFile);
                         filePathList.add(aliOSSUtil.uploadFile(videoImgFile, prefix + videoFileName + "." + videoImg.get("type")));
+                        videoImgFile.delete();
+                        videoFile.delete();
                     } else {
                         throw new RuntimeException("视频截图失败");
                     }