铸造订单

src/main/java/com/izouma/nineth/dto/MintOrderDTO.java

@@ -1,25 +1,16 @@
 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

src/main/resources/templates/AlipayHtml2.ftlh

@@ -152,10 +152,10 @@
     }
 
     setInterval(function () {
-        $.get('/mintOrder/${orderId}/status', function (data) {
+        $.get('/mintOrder/${id}/status', function (data) {
             console.log(data);
             if (data.status !== 'NOT_PAID') {
-                window.location = '/9th/activityOrderDetail?id=${orderId}';
+                window.location = '/9th/activityOrderDetail?id=${id}';
             }
         });
     }, 1000);

src/main/vue/src/views/MintActivityEdit.vue

@@ -100,29 +100,6 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                cover: [
-                    {
-                        validator: (rule, value, callback) => {
-                            if (value) {
-                                if (!(value instanceof Array)) {
-                                    callback(new Error('请上传内容'));
-                                    return;
-                                } else {
-                                    for (let f of value) {
-                                        if (!f.url) {
-                                            callback(new Error('请上传内容'));
-                                            return;
-                                        }
-                                    }
-                                }
-                                callback();
-                            } else {
-                                callback(new Error('请上传内容'));
-                            }
-                        },
-                        trigger: 'blur'
-                    }
-                ],
                 total: [
                     {
                         required: true,

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

@@ -1,6 +1,9 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.ApplicationTests;
+import com.izouma.nineth.domain.User;
+import com.izouma.nineth.enums.PayMethod;
+import com.izouma.nineth.repo.UserRepo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -10,6 +13,8 @@ class MintOrderServiceTest extends ApplicationTests {
 
     @Autowired
     private MintOrderService mintOrderService;
+    @Autowired
+    private UserRepo         userRepo;
 
     @Test
     void exchange() throws InterruptedException {
@@ -18,7 +23,18 @@ class MintOrderServiceTest extends ApplicationTests {
     }
 
     @Test
-    void test(){
+    void test() {
         mintOrderService.batchCancel();
     }
+
+    @Test
+    public void test1() {
+        User user = userRepo.findByIdAndDelFalse(9972L).orElse(null);
+        mintOrderService.create(user, Arrays.asList(151339L), 151155L, null);
+    }
+
+    @Test
+    public void test2() {
+        mintOrderService.mintNotify(151376L, PayMethod.ALIPAY, "xxx");
+    }
 }