Browse Source

价目表 新增5个字段

qinxuyang 3 weeks ago
parent
commit
b400da3df8

+ 17 - 1
alien-entity/src/main/java/shop/alien/entity/store/StorePrice.java

@@ -35,10 +35,26 @@ public class StorePrice {
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "分类ids(JSON数组,如:[1,2,3])")
+    @ApiModelProperty(value = "菜品分类id(varchar500,如 JSON 数组:[1,2,3])")
     @TableField("category_ids")
     private String categoryIds;
 
+    @ApiModelProperty(value = "首页展示(0:否, 1:是)")
+    @TableField("is_homepage_display")
+    private Integer isHomepageDisplay;
+
+    @ApiModelProperty(value = "标签(JSON数组,如:[\"XXX\",\"推荐\"])")
+    @TableField("tags")
+    private String tags;
+
+    @ApiModelProperty(value = "短评")
+    @TableField("dish_review")
+    private String dishReview;
+
+    @ApiModelProperty(value = "描述")
+    @TableField("description")
+    private String description;
+
     @ApiModelProperty(value = "总价")
     @TableField("total_price")
     private BigDecimal totalPrice;

+ 12 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/PriceListVo.java

@@ -73,6 +73,18 @@ public class PriceListVo {
     @ApiModelProperty(value = "菜品分类ids(JSON数组,如:[1,2,3])")
     private String categoryIds;
 
+    @ApiModelProperty(value = "首页展示(0:否, 1:是)")
+    private Integer isHomepageDisplay;
+
+    @ApiModelProperty(value = "标签(JSON数组)")
+    private String tags;
+
+    @ApiModelProperty(value = "短评")
+    private String dishReview;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
     @ApiModelProperty(value = "菜品分类名称(JSON数组,如:[\"热菜\",\"凉菜\"])")
     private String categoryNames;
 

+ 12 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreProductSelectVo.java

@@ -37,5 +37,17 @@ public class StoreProductSelectVo {
 
     @ApiModelProperty("分类名称列表")
     private List<String> categoryNames;
+
+    @ApiModelProperty("首页展示(0:否, 1:是)")
+    private Integer isHomepageDisplay;
+
+    @ApiModelProperty("标签(JSON数组)")
+    private String tags;
+
+    @ApiModelProperty("短评")
+    private String dishReview;
+
+    @ApiModelProperty("描述")
+    private String description;
 }
 

+ 1 - 0
alien-store/src/main/java/shop/alien/store/controller/StoreCuisineController.java

@@ -569,6 +569,7 @@ public class StoreCuisineController {
                     PriceListVo vo = new PriceListVo();
 
                     BeanUtils.copyProperties(storePrice, vo);
+                    vo.setCategoryNames(storeCuisineService.getCategoryNames(storePrice.getCategoryIds()));
                     priceListVo.add(vo);
                 }
             }

+ 18 - 0
alien-store/src/main/java/shop/alien/store/controller/StorePriceController.java

@@ -162,6 +162,15 @@ public class StorePriceController {
             if (StringUtils.isNotEmpty(storePrice.getUsageRule())) {
                 textContent.append(storePrice.getUsageRule()).append(" ");
             }
+            if (StringUtils.isNotEmpty(storePrice.getDescription())) {
+                textContent.append(storePrice.getDescription()).append(" ");
+            }
+            if (StringUtils.isNotEmpty(storePrice.getDishReview())) {
+                textContent.append(storePrice.getDishReview()).append(" ");
+            }
+            if (StringUtils.isNotEmpty(storePrice.getTags())) {
+                textContent.append(storePrice.getTags()).append(" ");
+            }
 
             List<String> imageUrls = new ArrayList<>();
 
@@ -291,6 +300,15 @@ public class StorePriceController {
             if (StringUtils.isNotEmpty(storePrice.getUsageRule())) {
                 textContent.append(storePrice.getUsageRule()).append(" ");
             }
+            if (StringUtils.isNotEmpty(storePrice.getDescription())) {
+                textContent.append(storePrice.getDescription()).append(" ");
+            }
+            if (StringUtils.isNotEmpty(storePrice.getDishReview())) {
+                textContent.append(storePrice.getDishReview()).append(" ");
+            }
+            if (StringUtils.isNotEmpty(storePrice.getTags())) {
+                textContent.append(storePrice.getTags()).append(" ");
+            }
 
             List<String> imageUrls = new ArrayList<>();
 

+ 4 - 0
alien-store/src/main/java/shop/alien/store/controller/StoreProductDiscountController.java

@@ -162,6 +162,10 @@ public class StoreProductDiscountController {
 		List<Integer> categoryIdList = parseCategoryIds(item.getCategoryIds());
 		vo.setCategoryIdList(categoryIdList);
 		vo.setCategoryNames(categoryIdList.stream().map(categoryNameMap::get).filter(StringUtils::hasText).collect(Collectors.toList()));
+		vo.setIsHomepageDisplay(item.getIsHomepageDisplay());
+		vo.setTags(item.getTags());
+		vo.setDishReview(item.getDishReview());
+		vo.setDescription(item.getDescription());
 		return vo;
 	}