Merge branch 'dev' of xiongzhu/raex_back into master

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

@@ -813,64 +813,7 @@ public class AssetService {
         }
     }
 
-//    public void destroy(Long id, Long userId ,String tradeCode) {
-//        Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-//        if (!asset.getUserId().equals(userId)) {
-//            throw new BusinessException("此藏品不属于你");
-//        }
-//        if (asset.getStatus() != AssetStatus.NORMAL) {
-//            throw new BusinessException("当前状态不可销毁");
-//        }
-//        if (asset.isPublicShow()) {
-//            throw new BusinessException("请先取消公开展示");
-////            cancelPublic(asset);
-//        }
-//        User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
-//        if (StringUtils.isEmpty(user.getTradeCode())){
-//            throw new BusinessException("未设置交易密码");
-//        }
-//        if (!passwordEncoder.matches(tradeCode, user.getTradeCode())) {
-//            throw new BusinessException("交易密码错误");
-//        }
-//
-//        User toUser = userRepo.findById(Constants.BLACK_HOLE_USER_ID).orElseThrow(new BusinessException("无记录"));
-//
-//        TokenHistory tokenHistory = TokenHistory.builder()
-//                .tokenId(asset.getTokenId())
-//                .fromUser(asset.getOwner())
-//                .fromUserId(asset.getOwnerId())
-//                .fromAvatar(asset.getOwnerAvatar())
-//                .toUser(toUser.getNickname())
-//                .toUserId(toUser.getId())
-//                .toAvatar(toUser.getAvatar())
-//                .operation(TransferReason.DESTROY.getDescription())
-//                .price(null)
-//                .build();
-//        tokenHistoryRepo.save(tokenHistory);
-//
-//        asset.setPublicShow(false);
-//        asset.setConsignment(false);
-//        asset.setPublicCollectionId(null);
-//        asset.setStatus(AssetStatus.DESTROYED);
-//        asset.setOwner(toUser.getNickname());
-//        asset.setOwnerId(toUser.getId());
-//        asset.setOwnerAvatar(toUser.getAvatar());
-//        assetRepo.saveAndFlush(asset);
-//        //积分记录
-//        destroyRecordRepo.save(DestroyRecord.builder()
-//                .userId(userId)
-//                .assetId(asset.getId())
-//                .name(asset.getName())
-//                .pic(asset.getPic().get(0).getUrl())
-//                .record(1)
-//                .type(RecordType.OBTAIN)
-//                .build());
-//
-//        //加积分
-//        userRepo.addDestroyPoint(userId, 1);
-//    }
-
-    public void destroy(Long id, Long userId) {
+    public void destroy(Long id, Long userId ,String tradeCode) {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         if (!asset.getUserId().equals(userId)) {
             throw new BusinessException("此藏品不属于你");
@@ -882,6 +825,13 @@ public class AssetService {
             throw new BusinessException("请先取消公开展示");
 //            cancelPublic(asset);
         }
+        User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
+        if (StringUtils.isEmpty(user.getTradeCode())){
+            throw new BusinessException("未设置交易密码");
+        }
+        if (!passwordEncoder.matches(tradeCode, user.getTradeCode())) {
+            throw new BusinessException("交易密码错误");
+        }
 
         User toUser = userRepo.findById(Constants.BLACK_HOLE_USER_ID).orElseThrow(new BusinessException("无记录"));
 
@@ -919,7 +869,6 @@ public class AssetService {
         //加积分
         userRepo.addDestroyPoint(userId, 1);
     }
-
     public double getRoyalties(Long minterId, double royalties, Long userId) {
         if (royalties == 3) {
             return 3;

src/main/java/com/izouma/nineth/web/AssetController.java

@@ -191,16 +191,10 @@ public class AssetController extends BaseController {
         return assetRepo.byTag(SecurityUtils.getAuthenticatedUser().getId(), tagId, pageable);
     }
 
-//    @ApiOperation("销毁")
-//    @PostMapping("/destroy")
-//    public void destroy(@RequestParam Long id ,@RequestParam String tradeCode) {
-//        assetService.destroy(id, SecurityUtils.getAuthenticatedUser().getId(),tradeCode);
-//    }
-
     @ApiOperation("销毁")
     @PostMapping("/destroy")
-    public void destroy(@RequestParam Long id) {
-        assetService.destroy(id, SecurityUtils.getAuthenticatedUser().getId());
+    public void destroy(@RequestParam Long id ,@RequestParam String tradeCode) {
+        assetService.destroy(id, SecurityUtils.getAuthenticatedUser().getId(),tradeCode);
     }
     @ApiOperation("开盲盒")
     @PostMapping("/open")