Переглянути джерело

受欢迎菜单增加销量

ZhangManMan 2 роки тому
батько
коміт
4c933d59ee

+ 9 - 0
src/main/java/com/sky/ioc/controller/system/UserController.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.controller.system;
 
+import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.entity.params.system.LoginParam;
 import com.sky.ioc.service.system.UserService;
 import com.sky.ioc.tool.Pbkdf2Sha256Digest;
@@ -57,6 +58,14 @@ public class UserController {
         return userService.phoneLogin(loginParam.getPhone(), loginParam.getCode());
     }
 
+    @ApiOperation("当前用户常用菜单")
+    @PostMapping("getCommonMenus")
+    public ReturnMsg getCommonMenus(@RequestParam(value = "userID")  long userID){
+
+
+        return userService.getUserInfoById(userID);
+    }
+
     public static void main(String[] args) {
         String pwd = "135246";
         System.out.println(Pbkdf2Sha256Digest.encode(pwd));

+ 2 - 0
src/main/java/com/sky/ioc/entity/domain/canteen/Cuisine.java

@@ -30,6 +30,8 @@ public class Cuisine {
      */
     private String Price;
 
+    private String saleNumber;
+
 
 /*    public Cuisine(String name){
         ThreadLocalRandom current = ThreadLocalRandom.current();

+ 1 - 1
src/main/java/com/sky/ioc/entity/domain/system/Users.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class Users {
 
-    private String id;
+    private Integer id;
     /** 用户名 */
     private String userName;
     /** 密码 */

+ 1 - 1
src/main/java/com/sky/ioc/mapper/scene/StrategyMapper.java

@@ -21,7 +21,7 @@ public interface StrategyMapper extends BaseMapper<Strategy> {
             "<if test ='status!=null '>" +
             " and status = #{status}" +
             "</if>" +
-            "<if test ='name!=null and name!=\" \" '>" +
+            "<if test ='name!=null and name!=\"\" '>" +
             " and name like  #{name}" +
             "</if>" +
             "</script>")

+ 9 - 1
src/main/java/com/sky/ioc/mapper/system/MenuMapper.java

@@ -6,6 +6,7 @@ import com.sky.ioc.entity.params.IocParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -14,7 +15,14 @@ import java.util.Map;
 public interface MenuMapper extends BaseMapper<Menus> {
 
     @Select("select * from  menus WHERE parent_id = #{parentId} ORDER BY order_num ")
-    List<Menus> getListParentId(@Param("parentId") Integer parentId);
+    List<Menus> getListByParentId(@Param("parentId") Integer parentId);
+
     @Select("select * from  menus  ")
     List<Menus> getList();
+    @Select("<script>" +
+            " select * from menus " +
+            " where id in (<foreach collection='ids' item='id' index='no' separator=','>#{id}</foreach>) "
+            + "</script>")
+    List<Menus> getListByIds(String ids);
+
 }

+ 3 - 0
src/main/java/com/sky/ioc/mapper/system/UserMapper.java

@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sky.ioc.entity.domain.system.Users;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface UserMapper extends BaseMapper<Users> {
     @Update("update  users set common_menus=#{menuIDs} WHERE id=#{userId} ")
     Integer updateCommonMenusByUserIdAndMenuId(@Param("userId") long userId,@Param("menuIDs")  String menuIDs);
+    @Select("select * from users ")
+    Users getUsersById(@Param("userId") long userId);
 
 }

+ 1 - 0
src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -146,6 +146,7 @@ public class RestaurantServiceImpl implements RestaurantService {
             cuisine.setCuisineImg(map.get("cuisine_img"));
             cuisine.setCuisineName(map.get("p_name"));
             cuisine.setPrice(map.get("price"));
+            cuisine.setSaleNumber(map.get("total"));
             cuisineList.add(cuisine);
         }
         return ReturnMsg.ok(cuisineList);

+ 2 - 0
src/main/java/com/sky/ioc/service/system/MenuService.java

@@ -9,4 +9,6 @@ public interface MenuService {
     ReturnMsg getMenusInfoList(long parentId);
 
     List<Menus> listWithTree(List<Menus> list,long parentId);
+
+    List<Menus> listByIds(String ids);
 }

+ 2 - 0
src/main/java/com/sky/ioc/service/system/UserService.java

@@ -15,4 +15,6 @@ public interface UserService {
     ReturnMsg updatePassword(long userId,String oldPwd, String newPwd);
 
     ReturnMsg phoneLogin(String phone, String code);
+
+    ReturnMsg getUserInfoById(long userId);
 }

+ 7 - 0
src/main/java/com/sky/ioc/service/system/impl/MenuServiceImpl.java

@@ -14,6 +14,8 @@ public class MenuServiceImpl implements MenuService {
 
     @Autowired
     MenuMapper menuMapper;
+
+
     @Override
     public ReturnMsg getMenusInfoList(long parentId) {
         List<Menus> lists = menuMapper.getList();
@@ -40,7 +42,12 @@ public class MenuServiceImpl implements MenuService {
         }
         return result;
      }
+
+    @Override
+    public List<Menus> listByIds(String ids) {
+        return  menuMapper.getListByIds(ids);
     }
+}
 
 
 

+ 16 - 0
src/main/java/com/sky/ioc/service/system/impl/UserServiceImpl.java

@@ -3,8 +3,10 @@ package com.sky.ioc.service.system.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sky.ioc.constant.Constant;
+import com.sky.ioc.entity.domain.system.Menus;
 import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.entity.result.system.LoginUserVo;
+import com.sky.ioc.mapper.system.MenuMapper;
 import com.sky.ioc.mapper.system.UserMapper;
 import com.sky.ioc.service.system.UserService;
 import com.sky.ioc.tool.JwtUtil;
@@ -18,6 +20,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -29,6 +32,9 @@ public class UserServiceImpl implements UserService {
     @Resource
     private RedisUtil redisUtil;
 
+    @Autowired
+    MenuMapper menuMapper;
+
     @Override
     public ReturnMsg updateCommonMenusByUserIdAndMenuId(long userId, String menuIDs) {
         userMapper.updateCommonMenusByUserIdAndMenuId(userId,menuIDs);
@@ -122,4 +128,14 @@ public class UserServiceImpl implements UserService {
         jsonObject.put("token", token);
         return ReturnMsg.ok(jsonObject, "登录成功");
     }
+
+    @Override
+    public ReturnMsg getUserInfoById(long userId) {
+        Users users = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getId, userId));
+        if(users!=null&&!users.getCommonMenus().isEmpty()){
+            List<Menus> menus = menuMapper.getListByIds(users.getCommonMenus());
+          //  users.set
+        }
+        return ReturnMsg.ok(users);
+    }
 }