相册转赠保存id

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -609,18 +609,21 @@ public class AssetService {
         newAsset.setOasisId(asset.getOasisId());
         newAsset.setFromAssetId(asset.getId());
         newAsset.setType(CollectionType.DEFAULT);
+
+        newAsset.setSource(TransferReason.GIFT == reason ? AssetSource.GIFT : AssetSource.TRANSFER);
+        newAsset.setTags(new HashSet<>(asset.getTags()));
+        newAsset.setSafeFlag(safeFlag);
+        newAsset.setHoldDays(asset.getOldHoldDays());
+        Long savedId = assetRepo.saveAndFlush(newAsset).getId();
+
         if (asset.getType().equals(CollectionType.PICTURE)) {
             newAsset.setType(CollectionType.PICTURE);
             PhotoAsset photoAsset = photoAssetRepo.findFirstByCreateAssetId(asset.getId());
             photoAsset.setGifted(true);
             photoAsset.setOwnerId(toUser.getId());
+            photoAsset.setCreateAssetId(savedId);
             photoAssetRepo.save(photoAsset);
         }
-        newAsset.setSource(TransferReason.GIFT == reason ? AssetSource.GIFT : AssetSource.TRANSFER);
-        newAsset.setTags(new HashSet<>(asset.getTags()));
-        newAsset.setSafeFlag(safeFlag);
-        newAsset.setHoldDays(asset.getOldHoldDays());
-        assetRepo.saveAndFlush(newAsset);
 
         TokenHistory tokenHistory = TokenHistory.builder()
                 .tokenId(asset.getTokenId())