铸造

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

@@ -2,10 +2,16 @@ package com.izouma.nineth.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.izouma.nineth.converter.FileObjectListConverter;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -18,5 +24,16 @@ public class MintMaterial {
 
     private String name;
 
+    @ApiModelProperty("图片")
+    @Convert(converter = FileObjectListConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<FileObject> pic;
+
+    @ApiModelProperty("编号")
+    private Integer number;
+
+    @ApiModelProperty("分类")
+    private String category;
+
     private Long privilegeId;
 }

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

@@ -86,6 +86,9 @@ public class MintOrderService {
             material.setAssetId(asset.getId());
             material.setCollectionId(asset.getCollectionId());
             material.setName(asset.getName());
+            material.setNumber(asset.getNumber());
+            material.setPic(asset.getPic());
+            material.setCategory(asset.getCategory());
             return material;
         }).collect(Collectors.toList());
 
@@ -194,6 +197,9 @@ public class MintOrderService {
             material.setCollectionId(asset.getCollectionId());
             material.setName(asset.getName());
             material.setPrivilegeId(privilegeIds.get(asset.getId()));
+            material.setNumber(asset.getNumber());
+            material.setPic(asset.getPic());
+            material.setCategory(asset.getCategory());
             return material;
         }).collect(Collectors.toList());
 

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

@@ -85,12 +85,12 @@ public class OrderNotifyController {
                 }
                 case "payGiftOrder": {
                     Long orderId = body.getLong("orderId");
-                    giftOrderService.giftNotify(orderId, PayMethod.WEIXIN, MapUtils.getString(params, "trade_no"));
+                    giftOrderService.giftNotify(orderId, PayMethod.ALIPAY, MapUtils.getString(params, "trade_no"));
                     break;
                 }
                 case "payMintOrder": {
                     Long orderId = body.getLong("orderId");
-                    mintOrderService.mintNotify(orderId, PayMethod.WEIXIN, MapUtils.getString(params, "trade_no"));
+                    mintOrderService.mintNotify(orderId, PayMethod.ALIPAY, MapUtils.getString(params, "trade_no"));
                     break;
                 }
             }

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

@@ -16,4 +16,9 @@ class MintOrderServiceTest extends ApplicationTests {
         mintOrderService.create(9972L, Arrays.asList(134607L, 132435L, 132433L));
         Thread.sleep(1000);
     }
+
+    @Test
+    void test(){
+        mintOrderService.batchCancel();
+    }
 }