diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java index 91b4fe3ec..4c4224415 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -51,6 +51,9 @@ public class ClientController extends BaseController { @Autowired private IFtOrderDaoService iFtOrderDaoService; + @Autowired + private IFtFoodDefaultDaoService foodDefaultDaoService; + /** * 获取用餐时间信息 * 日期:2020年12月11日 @@ -381,6 +384,18 @@ public class ClientController extends BaseController { return AjaxResult.success(list); } + /** + * 获取各餐品的价格清单 + * @author : 陈智兴 + * @param + */ + @GetMapping("/getDinnerPriceList") + public AjaxResult getDinnerPriceList() { + List list = foodDefaultDaoService.list(null); + return AjaxResult.success(list); + } + + /** * 获取订餐优惠比例 */ @@ -399,7 +414,9 @@ public class ClientController extends BaseController { public AjaxResult orderCollection(@RequestBody JSONObject params) { // 订单 id - Integer orderId = params.getInteger("orderId"); + Integer orderId = params.getInteger("staffId"); + // 订餐类型 + Integer type = params.getInteger("type"); // 实收 BigDecimal receipts = params.getBigDecimal("receipts");