铸造

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

@@ -1,6 +1,5 @@
 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;
@@ -11,10 +10,6 @@ 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;
@@ -36,6 +31,9 @@ public class MintOrder extends BaseEntity {
 
     private Long mintActivityId;
 
+    @Transient
+    private String mintActivity;
+
     @Column(columnDefinition = "TEXT")
     @Convert(converter = MintMaterialListConverter.class)
     @ApiModelProperty("铸造材料")

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

@@ -117,7 +117,7 @@ public class MintOrderService {
      * @param addressId      地址
      */
     @Transactional
-    public void create(User user, List<Long> assetId, Long mintActivityId, Long addressId) {
+    public Long create(User user, List<Long> assetId, Long mintActivityId, Long addressId) {
         // 参加的活动
         MintActivity mintActivity = mintActivityRepo.findByIdAndDelFalse(mintActivityId)
                 .orElseThrow(new BusinessException("无此铸造活动"));
@@ -221,7 +221,7 @@ public class MintOrderService {
 
         //库存
         mintActivity.setStock(mintActivity.getStock() - 1);
-        mintActivityRepo.save(mintActivity);
+        return mintActivityRepo.save(mintActivity).getId();
     }
 
     public Object payOrderWeixin(Long id, String tradeType, String openId) throws WxPayException, EncoderException {

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

@@ -53,6 +53,7 @@ public class MintOrderController extends BaseController {
                 .stream()
                 .collect(Collectors.toMap(MintActivity::getId, MintActivity::getName));
         return all.map(mintOrder -> {
+            mintOrder.setMintActivity(activityMap.get(mintOrder.getMintActivityId()));
             return mintOrder;
         });
     }
@@ -75,10 +76,10 @@ public class MintOrderController extends BaseController {
     }
 
     @PostMapping("/create")
-    public void create(@RequestParam String assets, @RequestParam Long mintActivityId, Long addressId) {
+    public Long create(@RequestParam String assets, @RequestParam Long mintActivityId, Long addressId) {
         LongArrayConverter lc = new LongArrayConverter();
         List<Long> assetIds = lc.convertToEntityAttribute(assets);
-        mintOrderService.create(SecurityUtils.getAuthenticatedUser(), assetIds, mintActivityId, addressId);
+        return mintOrderService.create(SecurityUtils.getAuthenticatedUser(), assetIds, mintActivityId, addressId);
     }
 
     @ApiOperation("导出尼尔斯")