wangqifan 4 anni fa
parent
commit
dd10b16686

+ 11 - 2
src/main/java/com/izouma/tcg/domain/card/Series.java

@@ -1,12 +1,17 @@
 package com.izouma.tcg.domain.card;
 
+import com.izouma.tcg.converter.StringArrayConverter;
 import com.izouma.tcg.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+import javax.persistence.Convert;
 import javax.persistence.Entity;
+import java.util.List;
 
 @Data
 @Entity
@@ -14,6 +19,10 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 @ApiModel(value = "系列", description = "系列")
 public class Series extends BaseEntity {
-    private String name;
-    private String description;
+    private String       name;
+    private String       description;
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty(value = "图片", name = "images")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> image;
 }

+ 5 - 5
src/main/java/com/izouma/tcg/service/card/CardCaseService.java

@@ -142,6 +142,10 @@ public class CardCaseService {
         cardCase.setSeriesId(collection.getSeriesId());
         cardCase.setCollectionId(collection.getId());
         cardCase.setCode(cardCaseInputDTO.getCode());
+        if (cardCase.getCode() == null) {
+            cardCase.setCode("");
+        }
+
         cardCase.setCaseStatus(cardCaseInputDTO.getCaseStatus());
         cardCase.setStartTime(cardCaseInputDTO.getStartTime());
         cardCase.setBoxPrice(cardCaseInputDTO.getBoxPrice());
@@ -196,11 +200,7 @@ public class CardCaseService {
         CardCaseInputDTO cardCaseInputDTO = new CardCaseInputDTO();
         cardCaseInputDTO.setCaseStatus(cardCase.getCaseStatus());
         cardCaseInputDTO.setBoxPrice(cardCase.getBoxPrice());
-        if (StringUtils.isNotBlank(cardCaseInputDTO.getCode())) {
-            cardCaseInputDTO.setCode(cardCase.getCode());
-        } else {
-            cardCaseInputDTO.setCode("");
-        }
+        cardCaseInputDTO.setCode(cardCase.getCode());
         cardCaseInputDTO.setId(cardCase.getId());
         cardCaseInputDTO.setBoxesCount(cardCase.getBoxesCount());
         cardCaseInputDTO.setCollectionId(cardCase.getCollectionId());

+ 3 - 0
src/main/vue/src/views/SeriesEdit.vue

@@ -21,6 +21,9 @@
                     <el-form-item prop="name" label="系列名">
                         <el-input v-model="formData.name"></el-input>
                     </el-form-item>
+                    <el-form-item prop="image" label="图片">
+                        <multi-upload v-model="formData.image"></multi-upload>
+                    </el-form-item>
                     <el-form-item prop="description" label="系列介绍">
                         <el-input
                             type="textarea"

+ 10 - 0
src/main/vue/src/views/SeriesList.vue

@@ -33,6 +33,16 @@
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
             <el-table-column prop="name" label="主题名"> </el-table-column>
             <el-table-column prop="description" label="主题介绍"> </el-table-column>
+            <el-table-column prop="image" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.image[0]"
+                        fit="cover"
+                        :preview-src-list="row.image"
+                    ></el-image>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>