铸造/拉新

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

@@ -151,4 +151,7 @@ public class Collection extends BaseEntity {
      */
     @ApiModelProperty("手动售罄")
     private boolean noSoldOut;
+
+    @ApiModelProperty("拉新任务指标")
+    private int assignment;
 }

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

@@ -242,7 +242,7 @@ public class MintOrderService {
                 .contactName(Optional.ofNullable(userAddress).map(UserAddress::getName).orElse(null))
                 .contactPhone(Optional.ofNullable(userAddress).map(UserAddress::getPhone).orElse(null))
                 .address(Optional.ofNullable(userAddress).map(u ->
-                                u.getProvinceId() + " " + u.getCityId() + " " + u.getDistrictId() + " " + u.getAddress())
+                                u.getProvinceName() + " " + u.getCityName() + " " + u.getDistrictName() + " " + u.getAddress())
                         .orElse(null))
                 .build());
 

src/main/vue/src/views/CollectionEdit.vue

@@ -200,7 +200,7 @@
                         <div class="tip">数字越大排序越靠前，相同数值按创建时间倒序排列</div>
                     </el-form-item>
                     <el-form-item prop="maxCount" label="限购">
-                        <el-input-number v-model="formData.maxCount"></el-input-number>
+                        <el-input-number v-model="formData.maxCount" :min="0" :step="1"></el-input-number>
                         <div class="tip">0表示不限购</div>
                     </el-form-item>
                     <el-form-item prop="countId" label="限购识别码" v-if="formData.maxCount > 0">
@@ -211,6 +211,10 @@
                         <el-radio v-model="formData.noSoldOut" :label="false">是</el-radio>
                         <el-radio v-model="formData.noSoldOut" :label="true">否</el-radio>
                     </el-form-item> -->
+                    <el-form-item prop="assignment" label="拉新任务指标">
+                        <el-input-number type="number" :min="0" :step="1" v-model="formData.assignment"></el-input-number>
+                        <div class="tip">0表示无指标</div>
+                    </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
@@ -320,7 +324,8 @@ export default {
                 countId: null,
                 canResale: true,
                 scanCode: false,
-                noSoldOut: true
+                noSoldOut: true,
+                assignment: 0
             },
             rules: {
                 name: [

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

@@ -235,4 +235,10 @@ export default {
 .width1 {
     width: 150px;
 }
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
 </style>

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

@@ -21,15 +21,15 @@
                     </el-form-item>
                     <el-form-item prop="userId" label="用户信息">
                         <el-input-number type="number" v-model="formData.userId" disabled></el-input-number>
-                    <!-- </el-form-item>
+                        <!-- </el-form-item>
                     <el-form-item prop="phone" label="手机号"> -->
-                        <el-input v-model="formData.phone" disabled style="margin-left:6px; width: 180px"></el-input>
+                        <el-input v-model="formData.phone" disabled style="margin-left: 6px; width: 180px"></el-input>
                     </el-form-item>
                     <el-form-item prop="mintActivity" label="铸造活动">
                         <el-input v-model="formData.mintActivity" disabled></el-input>
                     </el-form-item>
-                    <el-form-item prop="material" label="铸造材料">
-                        <div v-for="item in formData.material" :key="item" style="margin-bottom: 6px">
+                    <el-form-item label="铸造材料">
+                        <div v-for="item in formData.material" :key="item.collectionId" style="margin-bottom: 6px">
                             <el-input
                                 v-model="item.collectionId"
                                 style="width: 110px; margin-right: 6px"
@@ -94,11 +94,17 @@
                             type="datetime"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             placeholder="选择日期时间"
+                            disabled
                         >
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item prop="status" label="状态">
-                        <el-select v-model="formData.status" clearable filterable placeholder="请选择状态">
+                        <el-select
+                            v-model="formData.status"
+                            filterable
+                            placeholder="请选择状态"
+                            :disabled="formData.status == 'CANCELLED' || formData.status == 'NOT_PAID'"
+                        >
                             <el-option
                                 v-for="item in statusOptions"
                                 :key="item.value"
@@ -109,6 +115,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item prop="airDrop" label="类型">
+                        <el-radio v-model="formData.airDrop" :label="true" disabled>空投铸造</el-radio>
+                        <el-radio v-model="formData.airDrop" :label="false" disabled>实物铸造</el-radio>
+                    </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
@@ -222,4 +232,11 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
+</style>