星图支付

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

@@ -45,23 +45,23 @@ public class PhotoAssetService {
     }
 
     public PhotoAsset save(PhotoAsset record) {
-        //将选取的藏品取消上架
-        Asset asset = assetService.cancelConsignmentAndStore(record.getDestroyAssetId());
         record.setStatus(CollectionStatus.PENDING);
-        record.setUserAvatar(asset.getOwnerAvatar());
-        record.setUserName(asset.getOwner());
-        record.setDestroyAssetName(asset.getName());
         record.setOwnerId(record.getOwnerId());
         record.setGifted(false);
-        if (asset.getNumber() != null) {
-            record.setDestroyAssetNumber(asset.getNumber().toString());
-        }
-        if (asset.getPic() != null) {
-            record.setDestroyAssetPicture(asset.getPic().get(0));
-        }
         if (record.isDestroyed()) {
+            //将选取的藏品取消上架
             record.setOrderStatus(OrderStatus.FINISH);
             record.setPayMethod(PayMethod.DESTROY);
+            Asset asset = assetService.cancelConsignmentAndStore(record.getDestroyAssetId());
+            record.setUserAvatar(asset.getOwnerAvatar());
+            record.setUserName(asset.getOwner());
+            record.setDestroyAssetName(asset.getName());
+            if (asset.getNumber() != null) {
+                record.setDestroyAssetNumber(asset.getNumber().toString());
+            }
+            if (asset.getPic() != null) {
+                record.setDestroyAssetPicture(asset.getPic().get(0));
+            }
         } else {
             record.setOrderStatus(OrderStatus.NOT_PAID);
         }