|
|
@@ -58,7 +58,7 @@ public class AssetService {
|
|
|
if (query.containsKey("userId")) {
|
|
|
List<Long> orderId = orderRepo.findAllByUserIdAndOpenedFalse(Convert.convert(Long.class, query.get("userId")));
|
|
|
return all.map(asset -> {
|
|
|
- if (orderId.contains(asset.getOrderId())){
|
|
|
+ if (orderId.contains(asset.getOrderId())) {
|
|
|
asset.setOpened(false);
|
|
|
}
|
|
|
return asset;
|
|
|
@@ -293,6 +293,7 @@ public class AssetService {
|
|
|
newAsset.setSellPrice(null);
|
|
|
newAsset.setOrderId(orderId);
|
|
|
newAsset.setFromAssetId(asset.getId());
|
|
|
+ newAsset.setType(CollectionType.DEFAULT);
|
|
|
assetRepo.save(newAsset);
|
|
|
|
|
|
tokenHistoryRepo.save(TokenHistory.builder()
|