Merge branches 'master' and 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
+import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.APPOnlineSpuVO;
 import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
@@ -67,4 +68,19 @@ public interface RemoteDailyMenuService {
                                                    @RequestParam("merchantId") Long merchantId,
                                                    @RequestParam("categoryId") Long categoryId);
 
+
+    /**
+     * 根据菜品日期获取当天的菜品列表
+     * @param day  日期
+     * @param hourType 早中晚
+     * @param categoryId 分类id
+     * @param merchantId 商户id
+     * @return
+     */
+    @GetMapping("/canteenDailyMenu/ad/getCanteenList")
+    public R<List<ADCanteenDailyMenuListVO>> getCanteenList(@RequestParam("day") String day,
+                                                            @RequestParam(value = "hourType", required = false) Integer hourType,
+                                                            @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                                            @RequestParam(value = "merchantId") Long merchantId);
+
 }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java

@@ -12,6 +12,7 @@ import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
+import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
@@ -180,11 +181,12 @@ public class CanteenDailyMenuController {
     //    ---------AD------------
     @GetMapping("/ad/getCanteenList")
     @SysLog("查询每日菜品列表")
-    public R getCanteenList(@RequestParam("day") String day,
-                            @RequestParam(value = "hourType", required = false) Integer hourType,
-                            @RequestParam(value = "categoryId", required = false) Long categoryId) {
+    public R<List<ADCanteenDailyMenuListVO>> getCanteenList(@RequestParam("day") String day,
+                                                            @RequestParam(value = "hourType", required = false) Integer hourType,
+                                                            @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                                            @RequestParam(value = "merchantId") Long merchantId) {
 
-        return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId));
+        return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId,merchantId));
     }
 
 //    --------------APP---------------

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java

@@ -26,5 +26,5 @@ public interface CanteenDailyMenuMapper extends PjcloudBaseMapper<CanteenDailyMe
      * @return
      */
     List<ADCanteenDailyMenuListVO> getCanteenMenuList(@Param("day") String day, @Param("hourType") Integer hourType,
-                                                       @Param("categoryId") Long categoryId, DataScope dataScope);
+                                                       @Param("categoryId") Long categoryId, @Param("merchantId") Long merchantId,DataScope dataScope);
 }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java

@@ -47,7 +47,7 @@ public interface CanteenDailyMenuService extends IService<CanteenDailyMenuEntity
      * @param categoryId
      * @return
      */
-    List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId);
+    List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId);
 
     Page selectTimeFoodPage(Page page, DailyMenuDTO dailyMenuDTO);
 }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java

@@ -113,8 +113,8 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
     }
 
     @Override
-    public  List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId) {
-        return baseMapper.getCanteenMenuList(day, hourType, categoryId, DataScope.of());
+    public  List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId) {
+        return baseMapper.getCanteenMenuList(day, hourType, categoryId,merchantId, DataScope.of());
     }
 
     @Override

pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml

@@ -76,6 +76,9 @@
             <if test="day != null">
                 AND t.start_time = #{day}
             </if>
+            <if test="merchantId != null">
+                AND t.merchant_id = #{merchantId}
+            </if>
         </where>
     </select>
 </mapper>