Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev-meta

src/main/java/com/izouma/nineth/repo/TokenHistoryRepo.java

@@ -60,6 +60,6 @@ public interface TokenHistoryRepo extends JpaRepository<TokenHistory, Long>, Jpa
     List<TokenHistory> findByOperationAndCreatedAtBefore(String operation, LocalDateTime time);
 
     @Query(nativeQuery = true, value = "select to_user nickname, to_avatar avatar, to_user_id id from token_history " +
-            "where created_at > ?1 group by to_user_id order by sum(price) desc limit 10")
+            "where created_at > ?1 group by to_user_id order by sum(price) desc limit 20")
     List<Map<String, String>> top(LocalDateTime time);
 }

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

@@ -193,7 +193,7 @@ public class TradeAuctionOrderService {
                 }
 
                 tradeAuction
-                        .setCurrentEndTime(tradeAuction.getCurrentEndTime().plusDays(1));
+                        .setCurrentEndTime(tradeAuction.getCurrentStartTime().plusDays(1));
                 tradeAuction.setFixedPrice(tradeAuctionOrder.getPrice().multiply(BigDecimal.valueOf(150))
                         .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
                 tradeAuction.setStatus(TradeAuctionStatus.WAITING);

src/main/vue/src/views/TradeAuctionEdit.vue

@@ -15,9 +15,6 @@
                     <el-form-item prop="name" label="名称">
                         <el-input v-model="formData.name" style="width: 500px"></el-input>
                     </el-form-item>
-                    <el-form-item prop="auctionType" label="时间类型(1为当天8点，2为当天11点)">
-                        <el-input v-model="formData.auctionType" style="width: 100px"></el-input>
-                    </el-form-item>
                     <el-form-item prop="pic" label="图片">
                         <object-upload
                             v-model="formData.pic[0]"
@@ -27,23 +24,6 @@
                         ></object-upload>
                         <div class="tip">支持JPG、PNG、GIF、MP4，推荐长宽比1:1</div>
                     </el-form-item>
-                    <el-form-item prop="model3d" label="3D模型">
-                        <model-upload
-                            :limit="1"
-                            v-model="formData.model3d"
-                            :customUrl="customUrl"
-                            accept="application/zip"
-                            format="json"
-                            single
-                        ></model-upload>
-                        <div class="tip">请将FBX文件与贴图打包成zip压缩包上传</div>
-                    </el-form-item>
-                    <!--                    <el-form-item label="相机距离" v-if="formData.model3d">-->
-                    <!--                        <el-input-number v-model="scale" :min="0.1" :step="0.1"></el-input-number>-->
-                    <!--                    </el-form-item>-->
-                    <!--                    <el-form-item label="Y轴偏移" v-if="formData.model3d">-->
-                    <!--                        <el-input-number v-model="yOffset"></el-input-number>-->
-                    <!--                    </el-form-item>-->
                     <div class="inline-wrapper">
                         <el-form-item prop="minterId" label="铸造者">
                             <minter-select
@@ -65,9 +45,6 @@
                     <el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
                         <rich-text v-model="formData.detail"></rich-text>
                     </el-form-item>
-                    <el-form-item prop="category" label="分类">
-                        <el-input v-model="formData.category"></el-input>
-                    </el-form-item>
                     <el-form-item prop="properties" label="特性" style="width: calc(100vw - 450px)" size="mini">
                         <el-table :data="formData.properties">
                             <el-table-column prop="name" label="名称">
@@ -120,7 +97,7 @@
                     <el-form-item prop="price" label="起拍价">
                         <el-input-number type="number" v-model="formData.price"></el-input-number>
                     </el-form-item>
-                    <el-form-item prop="startTime" label="开始时间">
+                    <el-form-item prop="startTime" label="开始时间（任意一天的十一点或晚上八点）">
                         <el-date-picker
                             v-model="formData.startTime"
                             type="datetime"
@@ -128,9 +105,6 @@
                             placeholder="选择日期时间">
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item prop="minutes" label="间隔时间（分钟）">
-                        <el-input-number type="number" v-model="formData.minutes"></el-input-number>
-                    </el-form-item>
                     <el-form-item prop="recommendPrice" label="指导价">
                         <el-input-number type="number" v-model="formData.recommendPrice"></el-input-number>
                     </el-form-item>
@@ -146,6 +120,37 @@
                 </el-form>
             </div>
         </div>
+        <el-dialog :visible.sync="showPrivilegeEditDialog" width="600px" :title="privilegeForm.name">
+            <el-form
+                ref="privilegeForm"
+                :model="privilegeForm"
+                label-position="right"
+                label-width="80px"
+                :rules="privelegeRules"
+            >
+                <el-form-item
+                    prop="detail"
+                    label="详细内容"
+                    v-if="privilegeForm.type === 'text' || privilegeForm.type === 'exchange'"
+                >
+                    <el-input type="textarea" :autosize="{ minRows: 3 }" v-model="privilegeForm.detail"></el-input>
+                </el-form-item>
+                <el-form-item prop="detail" label="二维码" v-if="privilegeForm.type === 'qrcode'">
+                    <single-upload v-model="privilegeForm.detail"></single-upload>
+                </el-form-item>
+                <el-form-item
+                    prop="remark"
+                    label="说明"
+                    v-if="privilegeForm.type === 'qrcode' || privilegeForm.type === 'code'"
+                >
+                    <el-input type="textarea" :autosize="{ minRows: 3 }" v-model="privilegeForm.remark"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="showPrivilegeEditDialog = false">取消</el-button>
+                <el-button type="primary" @click="savePrivilege">保存</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -199,7 +204,8 @@ export default {
             privilegeForm: {},
             formData: {
                 pic: [],
-                properties: []
+                properties: [],
+                privileges: []
             },
             rules: {},
             cateogories: ['勋章', '收藏品', '数字艺术', '门票', '游戏', '音乐', '使用', '其他'],
@@ -210,6 +216,10 @@ export default {
                 "label": "一口价成交",
                 "value": "FIXED_PRICE_PURCHASED"
             }, {"label": "流拍", "value": "PASS"}, {"label": "完成", "value": "FINISH"}],
+            privelegeRules: {
+                detail: [{ required: true, message: '请填写内容' }],
+                remark: [{ required: true, message: '请填写说明' }]
+            }
         }
     }
     ,