Change 完善商铺和商品维护功能

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/business/FoodController.java

@@ -18,6 +18,8 @@ import cn.enilu.flash.utils.Maps;
 import cn.enilu.flash.utils.StringUtils;
 import cn.enilu.flash.utils.factory.Page;
 import org.nutz.json.Json;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,10 +43,11 @@ public class FoodController extends BaseController {
 
     @Autowired
     private IdsService idsService;
+    private Logger logger = LoggerFactory.getLogger(FoodController.class);
 
     @RequestMapping(value = "addfood",method = RequestMethod.POST)
     public Object add(@Valid @ModelAttribute FoodVo foodVo) {
-        System.out.println(Json.toJson(foodVo));
+        logger.info(Json.toJson(foodVo));
         Food food = new Food();
         BeanUtil.copyProperties(foodVo,food);
         food.setRestaurant_id(foodVo.getIdShop());
@@ -106,7 +109,6 @@ public class FoodController extends BaseController {
     }
     @RequestMapping(value="/v2/foods",method = RequestMethod.GET)
     public Object list(@RequestParam(value = "restaurant_id",required = false) Long restaurantId) {
-        //restaurantId="11";
         Page<Food> page = new PageFactory<Food>().defaultPage();
         if (StringUtils.isNullOrEmpty(restaurantId) || "undefined".equals(restaurantId)) {
             return Rets.success(mongoRepository.queryPage(page,Food.class));

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/business/RatingController.java

@@ -1,6 +1,7 @@
 package cn.enilu.flash.api.controller.business;
 
 import cn.enilu.flash.api.controller.BaseController;
+import cn.enilu.flash.bean.entity.front.Ratings;
 import cn.enilu.flash.bean.vo.front.Rets;
 import cn.enilu.flash.dao.MongoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +33,9 @@ public class RatingController extends BaseController {
     }
     @RequestMapping(value = "ugc/v2/restaurants/{restaurant_id}/ratings/tags",method = RequestMethod.GET)
     public Object tags(@PathVariable("restaurant_id")Long restaurantId){
-        Map map = mongoRepository.findOne("ratings","restaurant_id",restaurantId);
-        return map.get("tags");
+        Ratings ratings = mongoRepository.findOne(Ratings.class,"restaurant_id",restaurantId);
+//        return map.get("tags");
+        return  Rets.success(ratings.getTags());
     }
 
 }

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/business/ShopController.java

@@ -4,6 +4,7 @@ import cn.enilu.flash.api.controller.BaseController;
 import cn.enilu.flash.bean.constant.factory.PageFactory;
 import cn.enilu.flash.bean.entity.front.Ids;
 import cn.enilu.flash.bean.entity.front.Menu;
+import cn.enilu.flash.bean.entity.front.Ratings;
 import cn.enilu.flash.bean.entity.front.Shop;
 import cn.enilu.flash.bean.vo.business.CityInfo;
 import cn.enilu.flash.bean.vo.business.ShopVo;
@@ -218,9 +219,13 @@ public class ShopController extends BaseController {
             shop.setLocation(locations);
         }
 
-
         mongoRepository.save(shop);
+        Ratings ratings = mongoRepository.findOne(Ratings.class,Maps.newHashMap("restaurant_id",shop.getId()));
+        if(ratings==null){
+            ratings = new Ratings(shop.getId());
 
+            mongoRepository.save(ratings);
+        }
         return Rets.success();
     }
 

flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/Ratings.java

@@ -0,0 +1,30 @@
+package cn.enilu.flash.bean.entity.front;
+
+import cn.enilu.flash.bean.entity.front.sub.Rating;
+import cn.enilu.flash.bean.entity.front.sub.Score;
+import cn.enilu.flash.bean.entity.front.sub.Tag;
+import cn.enilu.flash.utils.Lists;
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.List;
+
+/**
+ * @author ：enilu
+ * @date ：Created in 2019/10/24 23:19
+ */
+@Data
+@Document(collection = "ratings")
+public class Ratings extends BaseMongoEntity {
+    private Long restaurant_id;
+    private List<Rating> ratings = Lists.newArrayList(new Rating());
+    private List<Tag> tags = Lists.newArrayList(new Tag());
+    private Score scores = new Score();
+
+    public Ratings(){
+
+    }
+    public Ratings(Long restaurant_id){
+        this.restaurant_id = restaurant_id;
+    }
+}

flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/sub/Rating.java

@@ -0,0 +1,23 @@
+package cn.enilu.flash.bean.entity.front.sub;
+
+import cn.enilu.flash.utils.Lists;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ：enilu
+ * @date ：Created in 2019/10/24 23:21
+ */
+@Data
+public class Rating {
+    private String avatar="";
+    private List highlights;
+    private List<RatingItem> item_ratings = Lists.newArrayList(new RatingItem());
+    private String rated_at;
+    private Integer rating_star;
+    private String rating_text;
+    private List tags;
+    private String time_spent_desc;
+    private String username = "匿名用户";
+}

flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/sub/RatingItem.java

@@ -0,0 +1,15 @@
+package cn.enilu.flash.bean.entity.front.sub;
+
+import lombok.Data;
+
+/**
+ * @author ：enilu
+ * @date ：Created in 2019/10/24 23:25
+ */
+@Data
+public class RatingItem {
+    private Integer food_id;
+    private String food_name;
+    private String image_hash = "";
+    private Integer is_valid = 1;
+}

flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/sub/Score.java

@@ -0,0 +1,17 @@
+package cn.enilu.flash.bean.entity.front.sub;
+
+import lombok.Data;
+
+/**
+ * @author ：enilu
+ * @date ：Created in 2019/10/24 23:21
+ */
+@Data
+public class Score {
+    private Integer compare_rating = 0;
+    private Integer deliver_time = 0;
+    private Integer food_score = 0;
+    private Integer order_rating_amount = 0;
+    private Integer overall_score = 0;
+    private Integer service_score = 0;
+}

flash-waimai-core/src/main/java/cn/enilu/flash/bean/entity/front/sub/Tag.java

@@ -0,0 +1,14 @@
+package cn.enilu.flash.bean.entity.front.sub;
+
+import lombok.Data;
+
+/**
+ * @author ：enilu
+ * @date ：Created in 2019/10/24 23:21
+ */
+@Data
+public class Tag {
+    private Integer count = 0;
+    private String name;
+    private Boolean unsatisfied=false;
+}

flash-waimai-core/src/main/java/cn/enilu/flash/bean/vo/business/FoodVo.java

@@ -21,6 +21,7 @@ public class FoodVo  extends Food {
     private List<SpecVo> specs;
     private String specsJson;
     private String attributesJson;
+    private Long category_id;
 
 
 }

flash-waimai-manage/src/views/business/food/add.js

@@ -190,8 +190,10 @@ export default {
       return ''
     },
     addFood(foodForm) {
+      console.log(this.selectValue.id)
       this.$refs[foodForm].validate(async(valid) => {
         if (valid) {
+
           const params = {
             ...this.foodForm,
             category_id: this.selectValue.id,

flash-waimai-mobile/src/page/shop/index.js

@@ -203,6 +203,7 @@ export default {
       this.totalPrice = 0;
       this.cartFoodList = [];
       this.menuList.forEach((item, index) => {
+        console.log('1',item.foods[0])
         if (this.shopCart&&this.shopCart[item.foods[0].category_id]) {
           let num = 0;
           Object.keys(this.shopCart[item.foods[0].category_id]).forEach(itemid => {