Browse Source

相册更新

wangqifan 3 năm trước cách đây
mục cha
commit
74a85fc3b5

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

@@ -493,7 +493,7 @@ public class AssetService {
         assetRepo.saveAndFlush(asset);
     }
 
-    public void cancelConsignmentAndStore(Long id) {
+    public Asset cancelConsignmentAndStore(Long id) {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         if (!asset.getUserId().equals(SecurityUtils.getAuthenticatedUser().getId())) {
             throw new BusinessException("此藏品不属于你");
@@ -515,7 +515,7 @@ public class AssetService {
         asset.setConsignment(false);
         asset.setPublicShow(false);
         asset.setStatus(AssetStatus.DESTROYING);
-        assetRepo.saveAndFlush(asset);
+        return assetRepo.saveAndFlush(asset);
     }
 
     public void cancelConsignment(Long id) {

+ 6 - 1
src/main/java/com/izouma/nineth/service/PhotoAssetService.java

@@ -34,7 +34,12 @@ public class PhotoAssetService {
 
     public PhotoAsset save(PhotoAsset record) {
         //将选取的藏品取消上架
-        assetService.cancelConsignmentAndStore(record.getDestroyAssetId());
+        Asset asset = assetService.cancelConsignmentAndStore(record.getDestroyAssetId());
+        record.setStatus(CollectionStatus.PENDING);
+        record.setUserAvatar(asset.getOwnerAvatar());
+        record.setUserName(asset.getOwner());
+        record.setDestroyAssetName(asset.getName());
+        record.setDestroyAssetName(asset.getNumber().toString());
         return photoAssetRepo.save(record);
     }