空投状态

src/main/java/com/izouma/nineth/enums/MintOrderStatus.java

@@ -4,6 +4,7 @@ public enum MintOrderStatus {
     NOT_PAID("未支付"),
     DELIVERY("待发货"),
     RECEIVE("待收货"),
+    AIR_DROP("待空投"),
     FINISH("已完成"),
     CANCELLED("已取消");
 

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

@@ -63,11 +63,17 @@ public class MintOrderService {
                 .phone(user.getPhone())
                 .material(materials)
                 .consume(true)
-                .status(MintOrderStatus.FINISH)
+                .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);
+    }
 }

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

@@ -74,5 +74,10 @@ public class MintOrderController extends BaseController {
         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);
+    }
 }
 

src/main/vue/src/views/MintOrderEdit.vue

@@ -142,6 +142,7 @@ export default {
                 { label: '未支付', value: 'NOT_PAID' },
                 { label: '待发货', value: 'DELIVERY' },
                 { label: '待收货', value: 'RECEIVE' },
+                { label: '待空投', value: 'AIR_DROP' },
                 { label: '已完成', value: 'FINISH' },
                 { label: '已取消', value: 'CANCELLED' }
             ],

src/main/vue/src/views/MintOrderList.vue

@@ -67,8 +67,9 @@
             <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="150">
+            <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>
@@ -118,6 +119,7 @@ export default {
                 { label: '未支付', value: 'NOT_PAID' },
                 { label: '待发货', value: 'DELIVERY' },
                 { label: '待收货', value: 'RECEIVE' },
+                { label: '待空投', value: 'AIR_DROP' },
                 { label: '已完成', value: 'FINISH' },
                 { label: '已取消', value: 'CANCELLED' }
             ],
@@ -217,6 +219,21 @@ export default {
                         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);
+                    }
+                });
         }
     }
 };