فهرست منبع

Merge branch 'dev' of xiongzhu/raex_back into master

licailing 4 سال پیش
والد
کامیت
17d7b06907
24فایلهای تغییر یافته به همراه1469 افزوده شده و 14 حذف شده
  1. 34 0
      src/main/java/com/izouma/nineth/converter/MintMaterialListConverter.java
  2. 60 0
      src/main/java/com/izouma/nineth/domain/MintActivity.java
  3. 21 0
      src/main/java/com/izouma/nineth/domain/MintMaterial.java
  4. 70 0
      src/main/java/com/izouma/nineth/domain/MintOrder.java
  5. 60 0
      src/main/java/com/izouma/nineth/dto/MintOrderDTO.java
  6. 20 0
      src/main/java/com/izouma/nineth/enums/MintOrderStatus.java
  7. 3 0
      src/main/java/com/izouma/nineth/repo/AssetRepo.java
  8. 16 0
      src/main/java/com/izouma/nineth/repo/MintActivityRepo.java
  9. 16 0
      src/main/java/com/izouma/nineth/repo/MintOrderRepo.java
  10. 9 0
      src/main/java/com/izouma/nineth/repo/TokenHistoryRepo.java
  11. 72 9
      src/main/java/com/izouma/nineth/service/AssetService.java
  12. 20 0
      src/main/java/com/izouma/nineth/service/MintActivityService.java
  13. 79 0
      src/main/java/com/izouma/nineth/service/MintOrderService.java
  14. 11 4
      src/main/java/com/izouma/nineth/web/AssetController.java
  15. 60 0
      src/main/java/com/izouma/nineth/web/MintActivityController.java
  16. 83 0
      src/main/java/com/izouma/nineth/web/MintOrderController.java
  17. 0 0
      src/main/resources/genjson/MintActivity.json
  18. 0 0
      src/main/resources/genjson/MintOrder.json
  19. 33 1
      src/main/vue/src/router.js
  20. 145 0
      src/main/vue/src/views/MintActivityEdit.vue
  21. 195 0
      src/main/vue/src/views/MintActivityList.vue
  22. 201 0
      src/main/vue/src/views/MintOrderEdit.vue
  23. 242 0
      src/main/vue/src/views/MintOrderList.vue
  24. 19 0
      src/test/java/com/izouma/nineth/service/MintOrderServiceTest.java

+ 34 - 0
src/main/java/com/izouma/nineth/converter/MintMaterialListConverter.java

@@ -0,0 +1,34 @@
+package com.izouma.nineth.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.izouma.nineth.domain.MintMaterial;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+import java.util.List;
+
+@Converter
+public class MintMaterialListConverter implements AttributeConverter<List<MintMaterial>, String> {
+
+    @Override
+    public String convertToDatabaseColumn(List<MintMaterial> materials) {
+        if (materials == null) {
+            return null;
+        }
+        return JSON.toJSONString(materials);
+    }
+
+    @Override
+    public List<MintMaterial> convertToEntityAttribute(String s) {
+        if (StringUtils.isEmpty(s)) {
+            return null;
+        }
+        try {
+            return JSONArray.parseArray(s, MintMaterial.class);
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+}

+ 60 - 0
src/main/java/com/izouma/nineth/domain/MintActivity.java

@@ -0,0 +1,60 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.converter.StringArrayConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("铸造活动")
+public class MintActivity extends BaseEntity{
+
+    @Searchable
+    private String name;
+
+    @ApiModelProperty("铸造者ID")
+    private Long minterId;
+
+    @ApiModelProperty("铸造者头像")
+    private String minterAvatar;
+
+    @ApiModelProperty("铸造者")
+    @Searchable
+    private String minter;
+
+    @ApiModelProperty("封面")
+    private String cover;
+
+    @ApiModelProperty("活动详情")
+    @Column(columnDefinition = "TEXT")
+    private String detail;
+
+    @ApiModelProperty("藏品名称")
+    private String collectionName;
+
+    @ApiModelProperty("藏品数量")
+    private int num;
+
+    @ApiModelProperty("是否消耗藏品")
+    private boolean consume;
+
+    @ApiModelProperty("剩余数量")
+    private int stock;
+
+    @ApiModelProperty("发行数量")
+    private int total;
+
+}

+ 21 - 0
src/main/java/com/izouma/nineth/domain/MintMaterial.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
+public class MintMaterial {
+    private Long assetId;
+
+    private Long collectionId;
+
+    private String name;
+
+}

+ 70 - 0
src/main/java/com/izouma/nineth/domain/MintOrder.java

@@ -0,0 +1,70 @@
+package com.izouma.nineth.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.converter.MintMaterialListConverter;
+import com.izouma.nineth.enums.MintOrderStatus;
+import com.izouma.nineth.enums.PayMethod;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("铸造订单")
+public class MintOrder extends BaseEntity {
+
+    private Long userId;
+
+    @Searchable
+    private String phone;
+
+    private Long mintActivityId;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = MintMaterialListConverter.class)
+    @ApiModelProperty("铸造材料")
+    private List<MintMaterial> material;
+
+    @ApiModelProperty("收货人")
+    private String contactName;
+
+    @ApiModelProperty("收货电话")
+    private String contactPhone;
+
+    @ApiModelProperty("收货地址")
+    private String address;
+
+    @ApiModelProperty("gas费")
+    @Column(precision = 10, scale = 2)
+    private BigDecimal gasPrice;
+
+    @ApiModelProperty("状态")
+    @Enumerated(EnumType.STRING)
+    private MintOrderStatus status;
+
+    @ApiModelProperty("支付方式")
+    @Enumerated(EnumType.STRING)
+    private PayMethod payMethod;
+
+    private LocalDateTime payAt;
+
+    @ApiModelProperty("是否消耗藏品")
+    private boolean consume;
+
+}

+ 60 - 0
src/main/java/com/izouma/nineth/dto/MintOrderDTO.java

@@ -0,0 +1,60 @@
+package com.izouma.nineth.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.converter.MintMaterialListConverter;
+import com.izouma.nineth.domain.BaseEntity;
+import com.izouma.nineth.domain.MintMaterial;
+import com.izouma.nineth.domain.MintOrder;
+import com.izouma.nineth.enums.MintOrderStatus;
+import com.izouma.nineth.enums.PayMethod;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("铸造订单")
+public class MintOrderDTO {
+
+    @ExcelProperty("ID")
+    private Long id;
+
+    @ExcelProperty("用户ID")
+    private Long userId;
+
+    @ExcelProperty("手机号")
+    private String phone;
+
+    @ExcelProperty("铸造时间")
+    private LocalDateTime createdAt;
+
+    @ExcelProperty("铸造材料")
+    private String material;
+
+    @ExcelProperty("状态")
+    private String status;
+
+    @ExcelProperty("是否消耗藏品")
+    private String consume;
+
+    public MintOrderDTO(MintOrder mintOrder) {
+        BeanUtils.copyProperties(mintOrder, this);
+        this.status = mintOrder.getStatus().getDescription();
+        this.consume = mintOrder.isConsume() ? "是" : "否";
+        this.material = mintOrder.getMaterial().stream().map(MintMaterial::getName).collect(Collectors.joining(","));
+    }
+
+}

+ 20 - 0
src/main/java/com/izouma/nineth/enums/MintOrderStatus.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.enums;
+
+public enum MintOrderStatus {
+    NOT_PAID("未支付"),
+    DELIVERY("待发货"),
+    RECEIVE("待收货"),
+    AIR_DROP("待空投"),
+    FINISH("已完成"),
+    CANCELLED("已取消");
+
+    private final String description;
+
+    MintOrderStatus(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

+ 3 - 0
src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
 import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
@@ -55,4 +56,6 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     Asset findFirstByTxHashIsNullAndTokenIdNotNullAndStatusOrderByCreatedAt(AssetStatus status);
 
     List<Asset> findByTxHashIsNullAndTokenIdNotNullAndCreatedAtBefore(LocalDateTime time);
+
+    List<Asset> findAllByIdInAndUserId(Collection<Long> id, Long userId);
 }

+ 16 - 0
src/main/java/com/izouma/nineth/repo/MintActivityRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MintActivity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MintActivityRepo extends JpaRepository<MintActivity, Long>, JpaSpecificationExecutor<MintActivity> {
+    @Query("update MintActivity t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

+ 16 - 0
src/main/java/com/izouma/nineth/repo/MintOrderRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.MintOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MintOrderRepo extends JpaRepository<MintOrder, Long>, JpaSpecificationExecutor<MintOrder> {
+    @Query("update MintOrder t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

+ 9 - 0
src/main/java/com/izouma/nineth/repo/TokenHistoryRepo.java

@@ -17,6 +17,15 @@ public interface TokenHistoryRepo extends JpaRepository<TokenHistory, Long>, Jpa
     @Query("select t from TokenHistory t where t.toUserId = ?1 or t.fromUserId = ?1 order by t.createdAt desc")
     Page<TokenHistory> userHistory(Long userId, Pageable pageable);
 
+    @Query("select t from TokenHistory t where t.toUserId = ?2 or t.fromUserId = ?1 order by t.createdAt desc")
+    Page<TokenHistory> userHistoryTo(Long userId, Long toUserId, Pageable pageable);
+
+    @Query("select t from TokenHistory t where t.toUserId = ?1 or t.fromUserId = ?2 order by t.createdAt desc")
+    Page<TokenHistory> userHistoryFrom(Long userId, Long fromUserId, Pageable pageable);
+
+    @Query("select t from TokenHistory t where t.toUserId = ?1 or t.fromUserId = ?1 order by t.createdAt desc")
+    List<TokenHistory> userHistory(Long userId);
+
     @Transactional
     @Modifying
     int deleteByTokenId(String tokenId);

+ 72 - 9
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.service;
 
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.UserHistory;
@@ -17,9 +18,8 @@ import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.TokenUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ApplicationContext;
@@ -28,14 +28,11 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.Predicate;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -344,10 +341,60 @@ public class AssetService {
         });
     }
 
-    public Page<UserHistory> userHistory(Long userId, Pageable pageable) {
-        Page<TokenHistory> page = tokenHistoryRepo.userHistory(userId, pageable);
+    public Page<UserHistory> userHistory(Long userId, Long toUserId, Long fromUserId, Pageable pageable) {
+        Page<TokenHistory> page;
+        if (ObjectUtils.isNotEmpty(toUserId)) {
+            page = tokenHistoryRepo.userHistoryTo(userId, toUserId, pageable);
+        } else if (ObjectUtils.isNotEmpty(fromUserId)) {
+            page = tokenHistoryRepo.userHistoryFrom(userId, fromUserId, pageable);
+        } else {
+            page = tokenHistoryRepo.userHistory(userId, pageable);
+        }
+        Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
+        List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
+
+        return page.map(tokenHistory -> {
+            UserHistory userHistory = new UserHistory();
+            BeanUtils.copyProperties(tokenHistory, userHistory);
+            Optional<Asset> asset = assets.stream().filter(a -> a.getTokenId().equals(tokenHistory.getTokenId()))
+                    .findAny();
+            userHistory.setAssetName(asset.map(Asset::getName).orElse(null));
+            userHistory.setPic(asset.map(Asset::getPic).orElse(new ArrayList<>()));
+            switch (tokenHistory.getOperation()) {
+                case "出售":
+                case "转让":
+                    userHistory.setDescription(tokenHistory.getToUserId().equals(userId) ? "作品交易——买入" : "作品交易——售出");
+                    break;
+                case "空投":
+                    userHistory.setDescription("空投");
+                    break;
+                case "转赠":
+                    userHistory.setDescription(tokenHistory.getToUserId().equals(userId) ? "他人赠送" : "作品赠送");
+                    break;
+            }
+            return userHistory;
+        });
+    }
+
+    public Page<UserHistory> userHistory(Long userId, PageQuery pageQuery) {
+        Page<TokenHistory> page = tokenHistoryRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, TokenHistory.class, root, criteriaQuery, criteriaBuilder);
+            Map<String, Object> query = pageQuery.getQuery();
+            if (ObjectUtils.isEmpty(query.get("toUserId")) && ObjectUtils.isEmpty(query.get("fromUserId"))) {
+                and.add(criteriaBuilder.or(criteriaBuilder.equal(root.get("toUserId"), userId), criteriaBuilder.equal(root.get("fromUserId"), userId)));
+            } else {
+                if (ObjectUtils.isNotEmpty(query.get("toUserId"))) {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("toUserId"), userId)));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("fromUserId"), userId)));
+                }
+            }
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+        }), JpaUtils.toPageRequest(pageQuery));
+
         Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
         List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
+
         return page.map(tokenHistory -> {
             UserHistory userHistory = new UserHistory();
             BeanUtils.copyProperties(tokenHistory, userHistory);
@@ -378,4 +425,20 @@ public class AssetService {
         return "ok";
     }
 
+
+    public Map<String, BigDecimal> breakdown(Long userId) {
+        List<TokenHistory> page = tokenHistoryRepo.userHistory(userId);
+        BigDecimal sale = page.stream()
+                .filter(th -> th.getFromUserId().equals(userId) && ObjectUtils.isNotEmpty(th.getPrice()))
+                .map(TokenHistory::getPrice)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal buy = page.stream()
+                .filter(th -> th.getToUserId().equals(userId) && ObjectUtils.isNotEmpty(th.getPrice()))
+                .map(TokenHistory::getPrice)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        Map<String, BigDecimal> map = new HashMap<>();
+        map.put("sale", sale);
+        map.put("buy", buy);
+        return map;
+    }
 }

+ 20 - 0
src/main/java/com/izouma/nineth/service/MintActivityService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.MintActivity;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MintActivityRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MintActivityService {
+
+    private MintActivityRepo mintActivityRepo;
+
+    public Page<MintActivity> all(PageQuery pageQuery) {
+        return mintActivityRepo.findAll(JpaUtils.toSpecification(pageQuery, MintActivity.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

+ 79 - 0
src/main/java/com/izouma/nineth/service/MintOrderService.java

@@ -0,0 +1,79 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.domain.MintMaterial;
+import com.izouma.nineth.domain.MintOrder;
+import com.izouma.nineth.domain.User;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.AssetStatus;
+import com.izouma.nineth.enums.MintOrderStatus;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AssetRepo;
+import com.izouma.nineth.repo.MintOrderRepo;
+import com.izouma.nineth.repo.UserRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class MintOrderService {
+
+    private MintOrderRepo mintOrderRepo;
+    private UserRepo      userRepo;
+    private AssetService  assetService;
+    private AssetRepo     assetRepo;
+
+    public Page<MintOrder> all(PageQuery pageQuery) {
+        return mintOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, MintOrder.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    @Transactional
+    public void create(Long userId, List<Long> assetIds) {
+        User user = userRepo.findByIdAndDelFalse(userId).orElseThrow(new BusinessException("用户不存在"));
+        User blackHole = userRepo.findByIdAndDelFalse(1435297L).orElseThrow(new BusinessException("无法铸造"));
+        if (assetIds.size() != 3) {
+            throw new BusinessException("数量不正确,请重新选择");
+        }
+        List<Asset> assets = assetRepo.findAllByIdInAndUserId(assetIds, userId);
+        assets = assets.stream()
+                .filter(asset -> asset.getName().contains("尼尔斯") && AssetStatus.NORMAL.equals(asset.getStatus()))
+                .collect(Collectors.toList());
+        if (assets.size() != 3) {
+            throw new BusinessException("有藏品不符合,请重新选择");
+        }
+        // 铸造资产
+        List<MintMaterial> materials = assets.stream().map(asset -> {
+            MintMaterial material = new MintMaterial();
+            material.setAssetId(asset.getId());
+            material.setCollectionId(asset.getCollectionId());
+            material.setName(asset.getName());
+            return material;
+        }).collect(Collectors.toList());
+
+        // 铸造订单
+        mintOrderRepo.save(MintOrder.builder()
+                .userId(userId)
+                .phone(user.getPhone())
+                .material(materials)
+                .consume(true)
+                .status(MintOrderStatus.AIR_DROP)
+                .build());
+
+        // 改为转赠
+        assets.forEach(asset -> assetService.transfer(asset, asset.getPrice(), blackHole, "转赠", null));
+
+    }
+
+    public void finish(Long id) {
+        MintOrder mintOrder = mintOrderRepo.findById(id).orElseThrow(new BusinessException("铸造订单不存在"));
+        mintOrder.setStatus(MintOrderStatus.FINISH);
+        mintOrderRepo.save(mintOrder);
+    }
+}

+ 11 - 4
src/main/java/com/izouma/nineth/web/AssetController.java

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/asset")
@@ -112,13 +113,19 @@ public class AssetController extends BaseController {
 
     @GetMapping("/userHistory")
     @ApiOperation("交易历史")
-    public Page<UserHistory> userHistory(Pageable pageable) {
-        return assetService.userHistory(SecurityUtils.getAuthenticatedUser().getId(), pageable);
+    public Page<UserHistory> userHistory(PageQuery pageQuery) {
+        return assetService.userHistory(SecurityUtils.getAuthenticatedUser().getId(), pageQuery);
     }
 
     @GetMapping("/mint")
-    public String mint( ) {
-        return assetService.mint( );
+    public String mint() {
+        return assetService.mint();
+    }
+
+    @GetMapping("/breakdown")
+    @ApiOperation("收支总计")
+    public Map<String, BigDecimal> breakdown() {
+        return assetService.breakdown(SecurityUtils.getAuthenticatedUser().getId());
     }
 }
 

+ 60 - 0
src/main/java/com/izouma/nineth/web/MintActivityController.java

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.MintActivity;
+import com.izouma.nineth.service.MintActivityService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MintActivityRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/mintActivity")
+@AllArgsConstructor
+public class MintActivityController extends BaseController {
+    private MintActivityService mintActivityService;
+    private MintActivityRepo mintActivityRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MintActivity save(@RequestBody MintActivity record) {
+        if (record.getId() != null) {
+            MintActivity orig = mintActivityRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return mintActivityRepo.save(orig);
+        }
+        return mintActivityRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MintActivity> all(@RequestBody PageQuery pageQuery) {
+        return mintActivityService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MintActivity get(@PathVariable Long id) {
+        return mintActivityRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        mintActivityRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MintActivity> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

+ 83 - 0
src/main/java/com/izouma/nineth/web/MintOrderController.java

@@ -0,0 +1,83 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.converter.LongArrayConverter;
+import com.izouma.nineth.domain.MintOrder;
+import com.izouma.nineth.dto.MintOrderDTO;
+import com.izouma.nineth.service.MintOrderService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MintOrderRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SecurityUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/mintOrder")
+@AllArgsConstructor
+public class MintOrderController extends BaseController {
+    private MintOrderService mintOrderService;
+    private MintOrderRepo    mintOrderRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MintOrder save(@RequestBody MintOrder record) {
+        if (record.getId() != null) {
+            MintOrder orig = mintOrderRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return mintOrderRepo.save(orig);
+        }
+        return mintOrderRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<MintOrder> all(@RequestBody PageQuery pageQuery) {
+        return mintOrderService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public MintOrder get(@PathVariable Long id) {
+        return mintOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        mintOrderRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MintOrder> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/create")
+    public void create(@RequestParam String assets) {
+        LongArrayConverter lc = new LongArrayConverter();
+        List<Long> assetIds = lc.convertToEntityAttribute(assets);
+        mintOrderService.create(SecurityUtils.getAuthenticatedUser().getId(), assetIds);
+    }
+
+    @ApiOperation("导出尼尔斯")
+    @PostMapping("/excelPhone")
+    public void excelPhone(HttpServletResponse response, @RequestBody PageQuery pageQuery) throws IOException {
+        List<MintOrderDTO> data = all(pageQuery).map(MintOrderDTO::new).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/finish/{id}")
+    public void finish(@PathVariable Long id) {
+        mintOrderService.finish(id);
+    }
+}
+

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/genjson/MintActivity.json


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
src/main/resources/genjson/MintOrder.json


+ 33 - 1
src/main/vue/src/router.js

@@ -438,7 +438,39 @@ const router = new Router({
                     meta: {
                         title: 'APP版本管理'
                     }
-                }
+                },
+                {
+                    path: '/mintActivityEdit',
+                    name: 'MintActivityEdit',
+                    component: () => import(/* webpackChunkName: "mintActivityEdit" */ '@/views/MintActivityEdit.vue'),
+                    meta: {
+                       title: '铸造活动编辑',
+                    },
+                },
+                {
+                    path: '/mintActivityList',
+                    name: 'MintActivityList',
+                    component: () => import(/* webpackChunkName: "mintActivityList" */ '@/views/MintActivityList.vue'),
+                    meta: {
+                       title: '铸造活动',
+                    },
+               },
+                {
+                    path: '/mintOrderEdit',
+                    name: 'MintOrderEdit',
+                    component: () => import(/* webpackChunkName: "mintOrderEdit" */ '@/views/MintOrderEdit.vue'),
+                    meta: {
+                       title: '铸造订单编辑',
+                    },
+                },
+                {
+                    path: '/mintOrderList',
+                    name: 'MintOrderList',
+                    component: () => import(/* webpackChunkName: "mintOrderList" */ '@/views/MintOrderList.vue'),
+                    meta: {
+                       title: '铸造订单',
+                    },
+               }
                 /**INSERT_LOCATION**/
             ]
         },

+ 145 - 0
src/main/vue/src/views/MintActivityEdit.vue

@@ -0,0 +1,145 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="108px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 600px"
+                >
+                    <el-form-item prop="name" label="活动名称">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="owner" label="铸造者">
+                        <minter-select
+                            v-model="formData.minterId"
+                            @detail="onMinterDetail"
+                            :disabled="!canEdit"
+                        ></minter-select>
+                    </el-form-item>
+                    <el-form-item prop="cover" label="封面">
+                        <single-upload v-model="formData.cover"></single-upload>
+                    </el-form-item>
+                    <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="collectionName" label="藏品名称">
+                        <el-input v-model="formData.collectionName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="num" label="藏品数量">
+                        <el-input-number type="number" v-model="formData.num"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="consume" label="是否消耗藏品">
+                        <el-radio v-model="formData.consume" :label="true">是</el-radio>
+                        <el-radio v-model="formData.consume" :label="false">否</el-radio>
+                    </el-form-item>
+                    <el-form-item prop="total" label="发行数量">
+                        <el-input-number type="number" v-model="formData.total"></el-input-number>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MintActivityEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('mintActivity/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/mintActivity/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/mintActivity/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        onMinterDetail(e) {
+            console.log(e);
+            this.$set(this.formData, 'minter', e.nickname);
+            this.$set(this.formData, 'minterAvatar', e.avatar);
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.inline-wrapper {
+    .el-form-item {
+        display: inline-block;
+    }
+}
+</style>

+ 195 - 0
src/main/vue/src/views/MintActivityList.vue

@@ -0,0 +1,195 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button>
+            <!-- <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+                导出
+            </el-button> -->
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="createdAt" label="创建时间" min-width="135"></el-table-column>
+            <el-table-column prop="name" label="活动名称" min-width="135" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="minter" label="铸造者" min-width="100"> </el-table-column>
+            <el-table-column prop="cover" label="封面" width="60">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.cover"
+                        fit="cover"
+                        :preview-src-list="[row.cover]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="detail" label="活动详情"> </el-table-column>
+            <el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
+
+            <el-table-column prop="num" label="藏品数量"> </el-table-column>
+            <el-table-column prop="consume" label="是否消耗藏品">
+                <template v-slot="{ row }">
+                    <el-tag type="success" v-if="row.consume">是</el-tag>
+                    <el-tag type="info" v-else>否</el-tag>
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="stock" label="剩余数量"> </el-table-column>
+            <el-table-column prop="total" label="发行数量"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'MintActivityList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/mintActivity/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/mintActivityEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/mintActivityEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/mintActivity/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/mintActivity/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

+ 201 - 0
src/main/vue/src/views/MintOrderEdit.vue

@@ -0,0 +1,201 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">删除</el-button> -->
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="115px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 550px"
+                >
+                    <el-form-item prop="userId" label="用户ID">
+                        <el-input-number type="number" v-model="formData.userId" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="phone" label="手机号">
+                        <el-input v-model="formData.phone" disabled></el-input>
+                    </el-form-item>
+                    <!-- <el-form-item prop="mintActivityId" label="mintActivityId">
+                        <el-input-number type="number" v-model="formData.mintActivityId"></el-input-number>
+                    </el-form-item> -->
+                    <el-form-item prop="material" label="铸造材料">
+                        <!-- <el-input v-model="formData.material"></el-input> -->
+                        <div v-for="item in formData.material" :key="item" style="margin-bottom: 6px">
+                            <el-input
+                                v-model="item.collectionId"
+                                style="width: 110px; margin-right: 6px"
+                                disabled
+                            ></el-input>
+                            <el-input v-model="item.name" style="width: 315px" disabled></el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="consume" label="是否消耗藏品">
+                        <el-radio-group v-model="formData.consume" disabled>
+                            <el-radio :label="true">是</el-radio>
+                            <el-radio :label="false">否</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <!-- <el-form-item prop="contactName" label="收货人">
+                        <el-input v-model="formData.contactName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="contactPhone" label="收货电话">
+                        <el-input v-model="formData.contactPhone"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="address" label="收货地址">
+                        <el-input v-model="formData.address"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="gasPrice" label="gas费">
+                        <el-input-number type="number" v-model="formData.gasPrice"></el-input-number>
+                    </el-form-item> -->
+                    <!-- <el-form-item prop="payMethod" label="支付方式">
+                        <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in payMethodOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="payAt" label="支付时间">
+                        <el-date-picker
+                            v-model="formData.payAt"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                    </el-form-item> -->
+                    <el-form-item prop="status" label="状态">
+                        <el-select v-model="formData.status" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in statusOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button> -->
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MintOrderEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('mintOrder/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                phone: [
+                    {
+                        required: true,
+                        message: '请输入phone',
+                        trigger: 'blur'
+                    },
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ],
+                contactPhone: [
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            statusOptions: [
+                { label: '未支付', value: 'NOT_PAID' },
+                { label: '待发货', value: 'DELIVERY' },
+                { label: '待收货', value: 'RECEIVE' },
+                { label: '待空投', value: 'AIR_DROP' },
+                { label: '已完成', value: 'FINISH' },
+                { label: '已取消', value: 'CANCELLED' }
+            ],
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/mintOrder/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/mintOrder/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

+ 242 - 0
src/main/vue/src/views/MintOrderList.vue

@@ -0,0 +1,242 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <!-- <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button> -->
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <created-at-picker v-model="createdAt" @input="getData" name="铸造" class="filter-item"></created-at-picker>
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID"> </el-table-column>
+            <el-table-column prop="phone" label="手机号"> </el-table-column>
+            <el-table-column prop="createdAt" label="铸造时间" min-width="120"> </el-table-column>
+            <!-- <el-table-column prop="mintActivityId" label="活动名称"> </el-table-column> -->
+            <el-table-column prop="material" label="铸造材料" min-width="120">
+                <template slot-scope="{ row }">
+                    <span v-for="item in row.material" :key="item.assestId">{{ item.name }}<br /></span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="consume" label="消耗藏品" width="90" align="center">
+                <template v-slot="{ row }">
+                    <el-tag type="success" v-if="row.consume">是</el-tag>
+                    <el-tag type="info" v-else>否</el-tag>
+                </template>
+            </el-table-column>
+            <!-- <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
+            <el-table-column prop="payAt" label="支付时间"> </el-table-column>
+            <el-table-column prop="contactName" label="收货人"> </el-table-column>
+            <el-table-column prop="contactPhone" label="收货电话"> </el-table-column>
+            <el-table-column prop="address" label="收货地址"> </el-table-column>
+            <el-table-column prop="gasPrice" label="gas费"> </el-table-column> -->
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="160">
+                <template slot-scope="{ row }">
+                    <el-button @click="finish(row)" type="warning" size="mini" plain v-if="row.status == 'AIR_DROP'">已空投</el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
+                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'MintOrderList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/mintOrder/all',
+            downloading: false,
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ],
+            statusOptions: [
+                { label: '未支付', value: 'NOT_PAID' },
+                { label: '待发货', value: 'DELIVERY' },
+                { label: '待收货', value: 'RECEIVE' },
+                { label: '待空投', value: 'AIR_DROP' },
+                { label: '已完成', value: 'FINISH' },
+                { label: '已取消', value: 'CANCELLED' }
+            ],
+            createdAt: ''
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        payMethodFormatter(row, column, cellValue, index) {
+            let selectedOption = this.payMethodOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false, createdAt: this.createdAt } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/mintOrderEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/mintOrderEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            let params = this.beforeGetData();
+            params.size = 10000;
+            this.$axios
+                .post('/mintOrder/excelPhone', params, {
+                    responseType: 'blob'
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', '铸造订单.xlsx');
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/mintOrder/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        finish(row) {
+            this.$alert('确定此订单已空投完成?', '提示', { type: 'primary' })
+                .then(() => {
+                    return this.$http.get(`/mintOrder/finish/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('订单完成');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

+ 19 - 0
src/test/java/com/izouma/nineth/service/MintOrderServiceTest.java

@@ -0,0 +1,19 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.ApplicationTests;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Arrays;
+
+class MintOrderServiceTest extends ApplicationTests {
+
+    @Autowired
+    private MintOrderService mintOrderService;
+
+    @Test
+    void exchange() throws InterruptedException {
+        mintOrderService.create(9972L, Arrays.asList(134607L, 132435L, 132433L));
+        Thread.sleep(1000);
+    }
+}

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است