提交

ruoyi-ui/src/views/skins/ttOrnaments/index.vue

@@ -8,11 +8,11 @@
       label-width="68px"
       size="small"
     >
-      <el-form-item label="饰品ID">
+      <el-form-item label="物品ID">
-        <el-input v-model="queryParams.id" placeholder="请输入饰品ID" clearable></el-input>
+        <el-input v-model="queryParams.id" placeholder="请输入物品ID" clearable></el-input>
       </el-form-item>
-      <el-form-item label="饰品名称">
+      <el-form-item label="物品名称">
-        <el-input v-model="queryParams.itemName" placeholder="请输入饰品名称" clearable></el-input>
+        <el-input v-model="queryParams.itemName" placeholder="请输入物品名称" clearable></el-input>
       </el-form-item>
       <el-form-item label="价格区间 ">
         <div style="width: 50%; display:flex;">
@@ -35,7 +35,7 @@
           size="mini"
           type="primary"
           @click="handleAdd"
-        >新增饰品</el-button>
+        >新增物品</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,8 +52,8 @@
 
     <el-table v-loading="loading" :data="ornamentsList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55" />
-      <el-table-column align="center" label="饰品ID" prop="id" width="100" />
+      <el-table-column align="center" label="物品ID" prop="id" width="100" />
-      <el-table-column align="center" label="饰品名称" prop="name" width="250" />
+      <el-table-column align="center" label="物品名称" prop="name" width="250" />
       <el-table-column align="center" label="图片" prop="imageUrl" width="80">
         <template slot-scope="scope">
           <image-preview :src="scope.row.imageUrl" :width="50" :height="50" />
@@ -151,14 +151,14 @@
         <el-button type="primary" @click="handleSubmit('ruleFormfa')">确 定</el-button>
       </div>
     </el-dialog>
-    <!-- 添加或修改饰品数据对话框 -->
+    <!-- 添加或修改物品数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="饰品图片URL" prop="imageUrl">
+        <el-form-item label="物品图片URL" prop="imageUrl">
           <el-input v-model="form.imageUrl" placeholder="请输入图片地址" />
         </el-form-item>
-        <el-form-item label="饰品名称" prop="name">
+        <el-form-item label="物品名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入饰品名称" />
+          <el-input v-model="form.name" placeholder="请输入物品名称" />
         </el-form-item>
         <el-form-item label="本站价格" prop="usePrice">
           <el-input v-model="form.usePrice" placeholder="请输入价格" />
@@ -180,12 +180,12 @@
     </el-dialog>
     <el-dialog :title="Detialtitle" :visible.sync="isDetia">
       <el-form ref="formDetialRef" :model="formDetial" :rules="rules" label-width="150px">
-        <el-form-item label="饰品图片" prop="imageUrl">
+        <el-form-item label="物品图片" prop="imageUrl">
           <image-preview :src="formDetial.imageUrl" :width="100" :height="100" />
         </el-form-item>
         <el-col :span="12">
-          <el-form-item label="饰品名称" prop="itemName">
+          <el-form-item label="物品名称" prop="itemName">
-            <el-input v-model="formDetial.itemName" placeholder="请输入饰品名称" disabled />
+            <el-input v-model="formDetial.itemName" placeholder="请输入物品名称" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -200,8 +200,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="ZBT官网饰品id" prop="itemId">
+          <el-form-item label="ZBT官网物品id" prop="itemId">
-            <el-input v-model="formDetial.itemId" placeholder="请输入ZBT官网饰品id" disabled />
+            <el-input v-model="formDetial.itemId" placeholder="请输入ZBT官网物品id" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -305,7 +305,7 @@ export default {
       listLevel: [],
       //
       dialogFormVisible: false,
-      //饰品详情
+      //物品详情
       Detialtitle: "",
       formDetial: {},
       isDetia: false,
@@ -324,7 +324,7 @@ export default {
       total: 0,
       //用户
       userList: [],
-      // 饰品数据表格数据
+      // 物品数据表格数据
       ornamentsList: [],
       // 弹出层标题
       title: "",
@@ -369,7 +369,7 @@ export default {
           { required: true, message: "请选择发放用户", trigger: "change" }
         ],
         ornamentsLevelId: [
-          { required: true, message: "请选择饰品等级", trigger: "change" }
+          { required: true, message: "请选择物品等级", trigger: "change" }
         ],
         num: [{ required: true, message: "请选择数量", trigger: "blur" }]
       },
@@ -455,7 +455,7 @@ export default {
       this.isDetia = true;
       this.Detialtitle = res.itemName;
     },
-    /** 查询饰品数据列表 */
+    /** 查询物品数据列表 */
     getList() {
       this.loading = true;
       listOrnaments(this.queryParams).then(response => {
@@ -521,7 +521,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加饰品数据";
+      this.title = "添加物品数据";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -535,7 +535,7 @@ export default {
         updateTime: row.updateTime
       };
       this.open = true;
-      this.title = "修改饰品数据";
+      this.title = "修改物品数据";
     },
     /** 提交按钮 */
     submitForm() {
@@ -561,7 +561,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除饰品数据编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除物品数据编号为"' + ids + '"的数据项？')
         .then(function() {
           return delOrnaments(ids);
         })

ruoyi-ui/src/views/skins/ttRoll/prize.vue

@@ -173,50 +173,17 @@
         </el-form-item>
 
         <el-tabs v-model="activeName" type="card" @tab-click="tabclick">
-          <el-tab-pane label="选择饰品" name="first">
+          <el-tab-pane label="选择物品" name="first">
             <el-form ref="queryForm" :inline="true" :model="orform" label-width="68px" size="small">
               <el-row>
                 <el-col :span="4">
-                  <el-form-item label="饰品ID" class="orform">
+                  <el-form-item label="物品ID" class="orform">
-                    <el-input v-model="orform.id" placeholder="请输入饰品ID" clearable></el-input>
+                    <el-input v-model="orform.id" placeholder="请输入物品ID" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
-                  <el-form-item label="饰品名称" class="orform">
+                  <el-form-item label="物品名称" class="orform">
-                    <el-input v-model="orform.name" placeholder="请输入饰品名称" clearable></el-input>
+                    <el-input v-model="orform.name" placeholder="请输入物品名称" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="外观" class="orform">
-                    <el-select v-model="orform.exterior" placeholder="请选择" clearable>
-                      <el-option
-                        v-for="dict in dict.type.ornaments_exterior_name"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="类型" class="orform">
-                    <el-select v-model="orform.type" placeholder="请选择" clearable>
-                      <el-option
-                        v-for="dict in dict.type.ornaments_type_name"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="价格区间" class="orform max">
-                    <div style="display:flex;">
-                      <el-input v-model="orform.minPrice" placeholder="最小值" clearable></el-input>
-                      <div style="width: 50px; "></div>
-                      <el-input v-model="orform.maxPrice" placeholder="最大值" clearable></el-input>
-                    </div>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
@@ -242,28 +209,11 @@
               <el-table-column align="center" type="selection" width="55" fixed></el-table-column>
               <el-table-column align="center" prop="name" label="名称" width="350"></el-table-column>
               <el-table-column align="center" prop="usePrice" label="价格"></el-table-column>
-              <el-table-column align="center" prop="quantity" label="在售数量"></el-table-column>
-              <el-table-column align="center" label="外观名称" prop="exteriorName">
-                <template slot-scope="scope">{{ scope.row.exteriorName || '无涂装' }}</template>
-              </el-table-column>
-              <el-table-column align="center" label="稀有度">
-                <template slot-scope="scope">
-                  <el-tag
-                    :color="scope.row.rarityColor"
-                    style="color: #fff;"
-                  >{{ scope.row.rarityName }}</el-tag>
-                </template>
-              </el-table-column>
               <el-table-column align="center" label="封面">
                 <template slot-scope="scope">
                   <image-preview :src="scope.row.imageUrl" :width="50" :height="50" />
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="类型">
-                <template slot-scope="scope">
-                  <el-tag>{{ scope.row.typeName }}</el-tag>
-                </template>
-              </el-table-column>
               <el-table-column align="center" label="更新时间" prop="updateTime" />
             </el-table>
 

ruoyi-ui/src/views/skins/ttRoll/prizedetail.vue

@@ -51,12 +51,12 @@
     <el-table :data="formWatchss" style="width: 100%" v-loading="loading">
       <el-table-column align="center" prop="id" label="id" width="180"></el-table-column>
       <el-table-column align="center" prop="jackpotName" label="所属奖池" width="180"></el-table-column>
-      <el-table-column align="center" prop label="饰品图">
+      <el-table-column align="center" prop label="物品图">
         <template slot-scope="scope">
           <image-preview :src="scope.row.imageUrl" :width="40" :height="40" />
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="shortName" label="饰品名称"></el-table-column>
+      <el-table-column align="center" prop="itemName" label="物品名称"></el-table-column>
       <el-table-column align="center" prop="usePrice" label="金额"></el-table-column>
       <!-- <el-table-column align="center" prop="usePrice" label="颜色"></el-table-column> -->
       <el-table-column align="center" prop="ornamentsNum" label="数量" width="50">
@@ -78,7 +78,6 @@
         </template>
       </el-table-column>
       <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
-      <el-table-column align="center" prop="updateTime" label="最后更新"></el-table-column>
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="mini" icon="el-icon-edit" @click="handleChange(scope.row)">编辑</el-button>

skins-model/src/main/java/com/ruoyi/domain/entity/roll/TtRollCdk.java

@@ -3,45 +3,44 @@ package com.ruoyi.domain.entity.roll;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
 import java.util.Date;
 
+/**
+ * Roll房CDK实体
+ * status: 0=未使用, 1=已使用
+ */
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
 @Builder
 @TableName(value = "tt_roll_cdk")
-public class TtRollCdk implements Serializable {
+public class TtRollCdk {
 
-    private static final long serialVersionUID = 1L;
+    @TableId(type = IdType.AUTO)
+    private Long id;
 
-    @TableId(value = "id", type = IdType.AUTO)
+    /** Roll房ID */
-    private Integer id;
-
-    /** 所属Roll房ID */
     private Integer rollId;
 
     /** CDK码 */
     private String cdkCode;
 
-    /** 状态：0未使用 1已使用 */
+    /** 状态：0=未使用，1=已使用 */
     private String status;
 
     /** 使用者用户ID */
     private Integer usedUserId;
 
     /** 使用时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date usedTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    /** 创建时间 */
     private Date createTime;
 }

skins-service/service-admin/src/main/resources/com/ruoyi/admin/mapper/TtRollJackpotOrnamentsMapper.xml

@@ -13,7 +13,7 @@
         tol.level_img,
         trjo.create_time,
         trjo.update_time,
-        tto.name,
+        tto.name as item_name,
         tto.short_name,
         tto.use_price,
         trjo.ornament_level_id as ornament_level_id,