拍卖 退回

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

@@ -376,7 +376,7 @@ public class AuctionOrderService {
                         //改回资产状态
                         Asset asset = assetRepo.findById(auction.getAssetId())
                                 .orElseThrow(new BusinessException("资产不存在"));
-                        asset.setStatus(AssetStatus.AUCTIONING);
+                        asset.setStatus(AssetStatus.NORMAL);
                         assetRepo.save(asset);
                     }
 
@@ -513,7 +513,14 @@ public class AuctionOrderService {
                             .getId(), AuctionPaymentType.PURCHASE_PRICE, AuctionOrderStatus.NOT_PAID);
                     //创建了订单
                     auctionOrders.forEach(this::passCancel);
-
+                    if (AuctionSource.TRANSFER.equals(act.getSource()) & act.getStatus()
+                            .equals(AuctionStatus.PURCHASED)) {
+                        //改回资产状态
+                        Asset asset = assetRepo.findById(act.getAssetId())
+                                .orElseThrow(new BusinessException("资产不存在"));
+                        asset.setStatus(AssetStatus.NORMAL);
+                        assetRepo.save(asset);
+                    }
 
                     //添加到流拍记录表里
                     if (!act.getStatus().equals(AuctionStatus.PASS)) {
@@ -528,13 +535,6 @@ public class AuctionOrderService {
                     auctionActivityRepo.save(act);
                     log.info("拍卖定时任务流拍{}", act.getId());
 
-                    if (AuctionSource.TRANSFER.equals(act.getSource())) {
-                        //改回资产状态
-                        Asset asset = assetRepo.findById(act.getAssetId())
-                                .orElseThrow(new BusinessException("资产不存在"));
-//                        asset.setStatus(AssetStatus.NORMAL);
-//                        assetRepo.save(asset);
-                    }
 
                     //退其余保证金
                     List<AuctionOrder> orders = auctionOrderRepo