|
|
@@ -189,9 +189,9 @@ public class MintOrderService {
|
|
|
|
|
|
|
|
|
List<Asset> assets = assetRepo.findAllByIdInAndUserId(assetId, user.getId());
|
|
|
- if (assets.stream().anyMatch(a -> a.isPublicShow() || a.isConsignment())) {
|
|
|
- throw new BusinessException("请先下架所选藏品");
|
|
|
- }
|
|
|
+// if (assets.stream().anyMatch(a -> a.isPublicShow() || a.isConsignment())) {
|
|
|
+// throw new BusinessException("请先下架所选藏品");
|
|
|
+// }
|
|
|
|
|
|
if (!mintActivity.isAudit()) {
|
|
|
if (assets.stream().anyMatch(a -> a.getStatus() != AssetStatus.NORMAL)) {
|
|
|
@@ -267,7 +267,7 @@ public class MintOrderService {
|
|
|
throw new BusinessException("已有订单不可取消寄售");
|
|
|
}
|
|
|
}
|
|
|
- asset.setConsignment(false);
|
|
|
+// asset.setConsignment(false);
|
|
|
}
|
|
|
Collection collection = collectionRepo.findById(asset.getPublicCollectionId())
|
|
|
.orElseThrow(new BusinessException("无展示记录"));
|
|
|
@@ -283,6 +283,9 @@ public class MintOrderService {
|
|
|
if (asset.isPublicShow()) {
|
|
|
asset.setPublicShow(false);
|
|
|
asset.setPublicCollectionId(null);
|
|
|
+ if (asset.isConsignment()) {
|
|
|
+ asset.setConsignment(false);
|
|
|
+ }
|
|
|
}
|
|
|
asset.setStatus(AssetStatus.MINTING);
|
|
|
assetRepo.save(asset);
|