ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/dto/OrderMealGeneratorCountDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/dto/OrderMealGeneratorDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderMealService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
@@ -1,6 +1,7 @@ package com.ruoyi.web.controller.api; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.domain. TBoard; import com.ruoyi.system.service.TBoardService; @@ -37,7 +38,7 @@ */ @ApiOperation( value = "查询餐桌列表") @PostMapping(value = "/list") public AjaxResult<List< TBoard>> list() { public AjaxResult<List<TBoard>> list() { return AjaxResult.success( boardService.list()); } @@ -60,11 +61,21 @@ } /** * 根据店铺id查询餐桌列表 */ @ApiOperation( value = "根据店铺id查询餐桌列表") @GetMapping(value = "/getBoardByShopId") public AjaxResult<List<TBoard>> getBoardByShopId(@RequestParam("shopId") Long shopId) { return AjaxResult.success( boardService.list(Wrappers.lambdaQuery(TBoard.class) .eq(TBoard::getShopId,shopId))); } /** * 查看 餐桌详情 */ @ApiOperation( value = "查看餐桌详情") @GetMapping(value = "/getDetailById") public AjaxResult< TBoard> getDetailById(@RequestParam("id") Long id) { public AjaxResult<TBoard> getDetailById(@RequestParam("id") Long id) { return AjaxResult.success( boardService.getById(id)); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
@@ -6,6 +6,7 @@ import com.ruoyi.system.domain.TOrderMeal; import com.ruoyi.system.dto.AddDishDTO; import com.ruoyi.system.dto.CheckoutDTO; import com.ruoyi.system.dto.OrderMealGeneratorDTO; import com.ruoyi.system.dto.TOrderMealDTO; import com.ruoyi.system.service.TGoodsTypeService; import com.ruoyi.system.service.TOrderMealService; @@ -75,8 +76,8 @@ @ApiOperation( value = "餐饮数据生成") @PostMapping(value = "/dataGenerator") public AjaxResult<String> dataGenerator(@Validated @RequestBody CheckoutDTO dto) { orderMealService.checkout(dto); public AjaxResult<String> dataGenerator(@RequestBody OrderMealGeneratorDTO dto) { orderMealService.dataGenerator(dto); return AjaxResult.success(); } } ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java
@@ -30,8 +30,8 @@ private Long id; @ApiModelProperty(value = "商家id") @TableField("companyId") private Long companyId; @TableField("shopId") private Long shopId; @ApiModelProperty(value = "餐桌名称") @TableField("boardName") ruoyi-system/src/main/java/com/ruoyi/system/dto/OrderMealGeneratorCountDTO.java
New file @@ -0,0 +1,27 @@ package com.ruoyi.system.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @Data @ApiModel(value = "OrderMealGeneratorCountDTO对象", description = "餐饮数据生成订单数量") public class OrderMealGeneratorCountDTO implements Serializable { @ApiModelProperty(value = "桌号") private String boardName; @ApiModelProperty(value = "日期") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private LocalDate time; @ApiModelProperty(value = "接单数") private Integer orderCount; } ruoyi-system/src/main/java/com/ruoyi/system/dto/OrderMealGeneratorDTO.java
New file @@ -0,0 +1,38 @@ package com.ruoyi.system.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @Data @ApiModel(value = "OrderMealGeneratorDTO对象", description = "餐饮数据生成") public class OrderMealGeneratorDTO implements Serializable { @ApiModelProperty(value = "店铺id") private Long shopId; @ApiModelProperty(value = "营业额小") private BigDecimal minTurnover; @ApiModelProperty(value = "营业额大") private BigDecimal maxTurnover; @ApiModelProperty(value = "微信占比") private BigDecimal weiXinProportion; @ApiModelProperty(value = "支付宝占比") private BigDecimal aliProportion; @ApiModelProperty(value = "银行卡占比") private BigDecimal cardProportion; @ApiModelProperty(value = "现金占比") private BigDecimal moneyProportion; @ApiModelProperty(value = "其他占比") private BigDecimal otherProportion; @ApiModelProperty(value = "订单数分配") private List<OrderMealGeneratorCountDTO> orderMealGeneratorCountDTOS; } ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderMealService.java
@@ -4,6 +4,7 @@ import com.ruoyi.system.domain.TOrderMeal; import com.ruoyi.system.dto.AddDishDTO; import com.ruoyi.system.dto.CheckoutDTO; import com.ruoyi.system.dto.OrderMealGeneratorDTO; import com.ruoyi.system.dto.TOrderMealDTO; /** @@ -34,4 +35,10 @@ * @param dto */ void checkout(CheckoutDTO dto); /** * 餐饮数据生成 * @param dto */ void dataGenerator(OrderMealGeneratorDTO dto); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
@@ -9,10 +9,7 @@ import com.ruoyi.system.domain.TOrderMeal; import com.ruoyi.system.domain.TOrderMealGoods; import com.ruoyi.system.domain.TOrderRemark; import com.ruoyi.system.dto.AddDishDTO; import com.ruoyi.system.dto.CheckoutDTO; import com.ruoyi.system.dto.MealOrderGoodsDTO; import com.ruoyi.system.dto.TOrderMealDTO; import com.ruoyi.system.dto.*; import com.ruoyi.system.mapper.TOrderMealGoodsMapper; import com.ruoyi.system.mapper.TOrderMealMapper; import com.ruoyi.system.service.TBoardService; @@ -139,4 +136,9 @@ board.setStatus(BoardEnum.FREE.getCode()); boardService.updateById(board); } @Override public void dataGenerator(OrderMealGeneratorDTO dto) { // 循环待生成订单列表,添加到集合中,批量插入 } }