Merge branch 'dev'

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

@@ -332,14 +332,14 @@ public class MintOrderService {
         MintActivity mintActivity = mintActivityRepo.findByIdAndDelFalse(mintActivityId)
                 .orElseThrow(new BusinessException("无此铸造活动"));
 
-        if (mintActivity.isScheduleSale()) {
-            if (mintActivity.getStartTime().isAfter(LocalDateTime.now())) {
-                throw new BusinessException("当前还未开售");
-            }
-        }
-        if (!mintActivity.isOnShelf()) {
-            throw new BusinessException("活动已下架");
-        }
+//        if (mintActivity.isScheduleSale()) {
+//            if (mintActivity.getStartTime().isAfter(LocalDateTime.now())) {
+//                throw new BusinessException("当前还未开售");
+//            }
+//        }
+//        if (!mintActivity.isOnShelf()) {
+//            throw new BusinessException("活动已下架");
+//        }
 
         UserAddress userAddress = null;
         if (addressId != null) {
@@ -489,7 +489,6 @@ public class MintOrderService {
 
             airDropService.testCreate(AirDrop.builder()
                     .name("铸造活动[" + mintActivity.getName() + "]空投")
-                    .remark(mintOrder.getId().toString())
                     .type(AirDropType.asset)
                     .userIds(Collections.singletonList(mintOrder.getUserId()))
                     .collectionId(mintActivity.getAirDropCollectionId())
@@ -499,11 +498,15 @@ public class MintOrderService {
                     .build());
         } catch (Exception e) {
             ex = e;
+            e.printStackTrace();
         }
         mintActivityService.increaseStock(mintActivityId, 1);
         if (ex == null) {
             return "测试通过";
         } else {
+            if (StringUtils.isEmpty(ex.getMessage())) {
+                return ex.toString();
+            }
             return ex.getMessage();
         }
     }

src/main/vue/src/views/MintActivityList.vue

@@ -75,10 +75,10 @@
                     <el-tag type="success" v-else>自动</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="120">
+            <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> -->
+                    <el-button @click="testLink(row)" size="mini" plain>测试</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -156,7 +156,7 @@ export default {
             this.$axios
                 .get('/mintActivity/excel', {
                     responseType: 'blob',
-                    params: { size: 10000 ,query: { del: false }},
+                    params: { size: 10000, query: { del: false } }
                 })
                 .then(res => {
                     console.log(res);
@@ -198,9 +198,11 @@ export default {
                         this.$message.error(e.error);
                     }
                 });
+        },
+        testLink(row) {
+            this.$alert(location.origin + `/9th/chooseProduct?activityId=${row.id}&test=true`);
         }
     }
 };
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>