Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/Asset.java

@@ -221,6 +221,10 @@ public class Asset extends CollectionBaseEntity {
 
     private String prefixName;
 
+    @ApiModelProperty("赋能列表")
+    @Column(columnDefinition = "TEXT")
+    private String empower;
+
     @Transient
     private int num;
 
@@ -256,6 +260,7 @@ public class Asset extends CollectionBaseEntity {
                 .source(AssetSource.OFFICIAL)
                 .tags(new HashSet<>(collection.getTags()))
                 .prefixName(collection.getPrefixName())
+                .empower(collection.getEmpower())
                 .build();
     }
 

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

@@ -207,6 +207,7 @@ public class AssetService {
         asset.setOrderId(orderId);
         asset.setPrice(price);
         asset.setPrefixName(collection.getPrefixName());
+        asset.setEmpower(collection.getEmpower());
         asset.setTags(new HashSet<>());
         if (blindBox.getTags() != null) {
             asset.getTags().addAll(blindBox.getTags());
@@ -812,6 +813,63 @@ 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) {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         if (!asset.getUserId().equals(userId)) {

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

@@ -191,12 +191,17 @@ 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());
     }
-
     @ApiOperation("开盲盒")
     @PostMapping("/open")
     public void open(@RequestParam Long id) {

src/main/vue/src/views/CollectionEdit.vue

@@ -70,9 +70,9 @@
                     <el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
                         <rich-text v-model="formData.detail"></rich-text>
                     </el-form-item>
-                    <!-- <el-form-item prop="empower" label="赋能列表" style="width: calc(100vw - 450px)">
+                    <el-form-item prop="empower" label="赋能列表" style="width: calc(100vw - 450px)">
                         <rich-text v-model="formData.empower"></rich-text>
-                    </el-form-item> -->
+                    </el-form-item>
                     <el-form-item prop="properties" label="特性" style="width: calc(100vw - 450px)" size="mini">
                         <el-table :data="formData.properties">
                             <el-table-column prop="name" label="名称">

src/test/java/com/izouma/nineth/service/AssetServiceTest.java

@@ -265,7 +265,7 @@ class AssetServiceTest extends ApplicationTests {
 
     @Test
     public void destroy() {
-        assetService.destroy(8025352L, 9972L);
+//        assetService.destroy(8025352L, 9972L);
     }
 
     @Test