licailing пре 4 година
родитељ
комит
c51e4d5879

+ 3 - 1
src/main/java/com/izouma/nineth/domain/Showroom.java

@@ -22,7 +22,7 @@ import java.util.List;
         @Index(columnList = "userId"),
         @Index(columnList = "assetId"),
         @Index(columnList = "likes"),
-        @Index(columnList = "share")
+        @Index(columnList = "heats")
 })
 @Where(clause = "del = 0")
 @ApiModel("展厅")
@@ -77,4 +77,6 @@ public class Showroom extends BaseEntity {
 
     private int heats;
 
+    private int registers;
+
 }

+ 4 - 0
src/main/java/com/izouma/nineth/repo/ShowroomRepo.java

@@ -51,4 +51,8 @@ public interface ShowroomRepo extends JpaRepository<Showroom, Long>, JpaSpecific
     @Transactional
     void addHeatAndLike(Long id, int heatNum, int likeNum);
 
+    @Query("update Showroom t set t.heats = t.heats + ?2, t.registers = t.registers + ?3 where t.id = ?1")
+    @Modifying
+    @Transactional
+    void addHeatAndRegister(Long id, int heatNum, int registerNum);
 }

+ 1 - 1
src/main/java/com/izouma/nineth/service/UserService.java

@@ -275,7 +275,7 @@ public class UserService {
                     .type(HeatType.REGISTER)
                     .value(weight)
                     .build());
-            showroomRepo.addHeat(showroomId, weight);
+            showroomRepo.addHeatAndRegister(showroomId, weight, 1);
         }
         return user;
     }

+ 12 - 7
src/main/vue/src/views/ShowroomEdit.vue

@@ -25,15 +25,12 @@
                             disabled
                         ></el-input>
                     </el-form-item>
-                    <el-form-item prop="sort" label="排序">
+                    <!-- <el-form-item prop="sort" label="排序">
                         <el-input-number v-model="formData.sort" :min="0"></el-input-number>
                         <div class="tip">数字越大排序越靠前,相同数值按创建时间倒序排列</div>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item prop="maxCollection" label="最多藏品数量">
-                        <el-input-number
-                            type="number"
-                            v-model="formData.maxCollection"
-                        ></el-input-number>
+                        <el-input-number type="number" v-model="formData.maxCollection"></el-input-number>
                     </el-form-item>
                     <el-form-item prop="userId" label="用户ID">
                         <el-input-number
@@ -94,6 +91,14 @@
                             <el-table-column prop="name" label="名称"></el-table-column>
                         </el-table>
                     </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="heats" label="热力值">
+                            <el-input-number type="number" v-model="formData.heats" disabled></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="registers" label="邀请数量">
+                            <el-input-number type="number" v-model="formData.registers" disabled></el-input-number>
+                        </el-form-item>
+                    </div>
                     <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">
@@ -198,4 +203,4 @@ export default {
     color: @text3;
     margin-top: 5px;
 }
-</style>
+</style>

+ 4 - 22
src/main/vue/src/views/ShowroomList.vue

@@ -63,28 +63,10 @@
             </el-table-column>
             <el-table-column prop="introduction" label="简介"> </el-table-column>
             <el-table-column prop="likes" label="点赞"> </el-table-column>
-            <el-table-column prop="sort" label="排序"></el-table-column>
+            <el-table-column prop="registers" label="邀请数"> </el-table-column>
+            <el-table-column prop="heats" label="热力值"></el-table-column>
+            <!-- <el-table-column prop="sort" label="排序"></el-table-column> -->
             <!-- <el-table-column prop="maxCollection" label="最多可放藏品数量"> </el-table-column> -->
-            <!-- <el-table-column prop="headBg" label="头部背景">
-                <template slot-scope="{ row }">
-                    <el-image
-                        style="width: 30px; height: 30px"
-                        :src="row.headBg"
-                        fit="cover"
-                        :preview-src-list="[row.headBg]"
-                    ></el-image>
-                </template>
-            </el-table-column>
-            <el-table-column prop="showroomBg" label="展厅背景">
-                <template slot-scope="{ row }">
-                    <el-image
-                        style="width: 30px; height: 30px"
-                        :src="row.showroomBg"
-                        fit="cover"
-                        :preview-src-list="[row.showroomBg]"
-                    ></el-image>
-                </template>
-            </el-table-column> -->
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="210">
                 <template slot-scope="{ row, $index }">
@@ -199,7 +181,7 @@ export default {
         },
         beforeGetData() {
             return {
-                sort: 'sort,desc;id,desc',
+                sort: 'heats,desc;id,desc',
                 search: this.search,
                 query: { del: false, type: 'COMPANY', status: this.status }
             };

+ 15 - 1
src/main/vue/src/views/company/CompanyRoomEdit.vue

@@ -60,6 +60,7 @@
                                 :value="item.id"
                             ></el-option>
                         </el-select>
+                        <el-link style="margin-left: 30px">展厅预览</el-link>
                     </el-form-item>
                     <el-form-item prop="headBg" label="背景" v-if="formData.settingId">
                         <el-image :src="formData.headBg" style="height: 170px"></el-image>
@@ -85,6 +86,14 @@
                         </el-table>
                         <el-button @click="addCollection" size="mini">添加</el-button>
                     </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="heats" label="热力值">
+                            <el-input-number type="number" v-model="formData.heats" disabled></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="registers" label="邀请数量">
+                            <el-input-number type="number" v-model="formData.registers" disabled></el-input-number>
+                        </el-form-item>
+                    </div>
                     <!-- <el-form-item prop="publish" label="发布" v-if="formData.status == 'SUCCESS'">
                         <el-radio v-model="formData.publish" :label="true">是</el-radio>
                         <el-radio v-model="formData.publish" :label="false">否</el-radio>
@@ -296,4 +305,9 @@ export default {
 /deep/.el-textarea.is-disabled .el-textarea__inner {
     color: #7c7e7e;
 }
-</style>
+.inline-wrapper {
+    .el-form-item {
+        display: inline-block;
+    }
+}
+</style>

+ 2 - 0
src/main/vue/src/views/company/CompanyRoomList.vue

@@ -44,6 +44,8 @@
                 </template>
             </el-table-column> -->
             <el-table-column prop="likes" label="点赞"> </el-table-column>
+            <el-table-column prop="registers" label="邀请数"> </el-table-column>
+            <el-table-column prop="heats" label="热力值"></el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="150">
                 <template slot-scope="{ row }">

Разлика између датотеке није приказан због своје велике величине
+ 321 - 321
src/main/vue/yarn.lock


Неке датотеке нису приказане због велике количине промена