Просмотр исходного кода

Merge branch 'dev-meta' of xiongzhu/raex_back into master

sunkean 3 лет назад
Родитель
Сommit
3e922ca0b6

+ 2 - 6
src/main/java/com/izouma/nineth/service/MetaShowRoomAssetService.java

@@ -56,12 +56,8 @@ public class MetaShowRoomAssetService {
         return MetaRestResult.returnSuccess("上架成功", Boolean.TRUE);
         return MetaRestResult.returnSuccess("上架成功", Boolean.TRUE);
     }
     }
 
 
-    public MetaRestResult<Boolean> putOff(MetaShowRoomAsset metaShowRoomAsset) {
-        MetaServiceResult result = checkParams(metaShowRoomAsset);
-        if (!result.isSuccess()) {
-            return MetaRestResult.returnError(result.getMessage(), Boolean.FALSE);
-        }
-        metaShowRoomAssetRepo.deleteByShowRoomIdAndAssetId(metaShowRoomAsset.getShowRoomId(), metaShowRoomAsset.getAssetId());
+    public MetaRestResult<Boolean> putOff(Long assetId) {
+        metaShowRoomAssetRepo.deleteByAssetId(assetId);
         return MetaRestResult.returnSuccess("下架成功", Boolean.TRUE);
         return MetaRestResult.returnSuccess("下架成功", Boolean.TRUE);
     }
     }
 
 

+ 2 - 2
src/main/java/com/izouma/nineth/web/MetaShowRoomAssetController.java

@@ -52,8 +52,8 @@ public class MetaShowRoomAssetController extends BaseController {
     }
     }
 
 
     @PostMapping("/putOff")
     @PostMapping("/putOff")
-    public MetaRestResult<Boolean> putOff(@RequestBody MetaShowRoomAsset metaShowRoomAsset) {
-        return metaShowRoomAssetService.putOff(metaShowRoomAsset);
+    public MetaRestResult<Boolean> putOff(@RequestParam Long assetId) {
+        return metaShowRoomAssetService.putOff(assetId);
     }
     }
 
 
     @PostMapping("/putOffAll")
     @PostMapping("/putOffAll")