收藏问题

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java

@@ -63,6 +63,9 @@ public class MenuCollectionDishes extends BaseEntity {
     @ApiModelProperty(value = "售出数量")
     private Integer saleNum;
 
+    @ApiModelProperty("是否收藏(1-收藏,2-未收藏)")
+    private Integer isFavorites;
+
     public String getImageUrl() {
         return FileUrlUtil.getFileUrl(this.imageUrl);
     }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuCollectionDishesMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.menu.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.menu.domain.MenuCollectionDishes;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 菜品收藏Mapper接口
@@ -18,6 +19,8 @@ public interface MenuCollectionDishesMapper {
      */
     public MenuCollectionDishes selectMenuCollectionDishesById(Long dishesId);
 
+    public int getCollectionCountByUserIdAndDishesId(@Param("userId") Long userId, @Param("dishesId") Long dishesId);
+
     /**
      * 查询菜品收藏列表
      * 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuCollectionDishesServiceImpl.java

@@ -1,8 +1,10 @@
 package com.bonus.canteen.core.menu.service.impl;
 
 import java.util.List;
+import com.bonus.canteen.core.nutrition.common.enums.YesOrNoEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.menu.mapper.MenuCollectionDishesMapper;
@@ -28,7 +30,14 @@ public class MenuCollectionDishesServiceImpl implements IMenuCollectionDishesSer
      */
     @Override
     public MenuCollectionDishes selectMenuCollectionDishesById(Long dishesId) {
-        return menuCollectionDishesMapper.selectMenuCollectionDishesById(dishesId);
+        MenuCollectionDishes result = menuCollectionDishesMapper.selectMenuCollectionDishesById(dishesId);
+        int countDishes = this.menuCollectionDishesMapper.getCollectionCountByUserIdAndDishesId(SecurityUtils.getUserId(), dishesId);
+        if (countDishes > 0) {
+            result.setIsFavorites(YesOrNoEnum.YES.key());
+        } else {
+            result.setIsFavorites(YesOrNoEnum.NO.key());
+        }
+        return result;
     }
 
     /**

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java

@@ -16,7 +16,6 @@ import com.bonus.canteen.core.menu.domain.MenuDishesType;
 import com.bonus.canteen.core.menu.vo.DrpUnitPageVO;
 import com.bonus.canteen.core.menu.vo.MenuDishesTypeAllVO;
 import com.bonus.canteen.core.utils.BnsConstants;
-import com.bonus.canteen.core.utils.GlobalConstants;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.houqin.constant.DelFlagEnum;
 import com.bonus.common.houqin.i18n.I18n;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialCategoryServiceImpl.java

@@ -17,7 +17,6 @@ import com.bonus.canteen.core.menu.enums.RoleCodeEnum;
 import com.bonus.canteen.core.menu.vo.MenuCategoryTreeVO;
 import com.bonus.canteen.core.menu.enums.LeLevelEnum;
 import com.bonus.canteen.core.utils.BnsConstants;
-import com.bonus.canteen.core.utils.GlobalConstants;
 import com.bonus.canteen.core.utils.TreeNodeUtil;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.houqin.constant.DelFlagEnum;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/GlobalConstants.java

@@ -1,81 +0,0 @@
-package com.bonus.canteen.core.utils;
-
-/**
- * 全局常量
- * @author bns_han
- */
-public class GlobalConstants {
-    /**
-     * super admin role key
-     */
-    public static final String SUPER_ADMIN_ROLE_KEY = "admin";
-    /**
-     * 字符串 MSIE
-     */
-    public static final String STRING_MSIE = "MSIE";
-    /**
-     * 字符串 Firefox
-     */
-    public static final String STRING_FIREFOX = "Firefox";
-    /**
-     * 字符串 Chrome
-     */
-    public static final String STRING_CHROME = "Chrome";
-    /**
-     * 字符串 #//
-     */
-    public static final String STRING_HASH_HASH = "#//";
-    /**
-     * 字符串 unknown
-     */
-    public static final String STRING_UNKNOWN = "unknown";
-    /**
-     * 字符串 ,
-     */
-    public static final String STRING_COMMA = ",";
-    /**
-     * 字符串 *
-     */
-    public static final String STRING_ASTERISK = "*";
-    /**
-     * 字符串 ascending
-     */
-    public static final String STRING_ASCENDING = "ascending";
-    /**
-     * 字符串 descending
-     */
-    public static final String STRING_DESCENDING = "descending";
-    /**
-     * 字符串 application/json
-     */
-    public static final String STRING_APPLICATION_JSON = "application/json";
-    /**
-     * 字符串 XMLHttpRequest
-     */
-    public static final String STRING_XML_HTTP_REQUEST = "XMLHttpRequest";
-    /**
-     * 字符串 .json
-     */
-    public static final String STRING_JSON = ".json";
-    /**
-     * 字符串 .xml
-     */
-    public static final String STRING_XML = ".xml";
-    /**
-     * 字符串 _
-     */
-    public static final String STRING_UNDERLINE = "_";
-    /**
-     * 字符串 win
-     */
-    public static final String STRING_WIN = "win";
-    /**
-     * 字符串 ok
-     */
-    public static final String STRING_OK = "ok";
-    /**
-     * 字符串 true
-     */
-    public static final String STRING_TRUE = "true";
-
-}

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml

@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectMenuCollectionDishesVo"/>
         where mcd.dishes_id = #{dishesId}
     </select>
+
+    <select id = "getCollectionCountByUserIdAndDishesId" resultType="Integer">
+        select count(1)
+        from menu_collection_dishes
+        where user_id = #{userId} and dishes_id = #{dishesId}
+    </select>
         
     <insert id="insertMenuCollectionDishes" parameterType="com.bonus.canteen.core.menu.domain.MenuCollectionDishes" useGeneratedKeys="true" keyProperty="id">
         insert into menu_collection_dishes