From a4e4fc6e7f99f1168e23ebb02d03f7d3938eb055 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 18 Apr 2025 15:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/AccSubOperationQueryParam.java | 5 ++ .../domain/param/AccountInfoQueryParam.java | 5 ++ .../order/controller/OrderInfoController.java | 14 ++-- .../OrderShoppingCartController.java | 5 +- .../canteen/core/order/domain/OrderInfo.java | 8 ++ .../order/domain/param/OrderQueryParam.java | 29 +++++-- .../core/order/mapper/OrderInfoMapper.java | 3 +- .../canteen/core/order/module/MenuModule.java | 4 +- .../core/order/service/IOrderInfoService.java | 7 +- .../service/impl/OrderInfoServiceImpl.java | 14 +++- .../mapper/account/AccInfoMapper.xml | 6 +- .../mapper/account/AccTradeMapper.xml | 1 + .../mapper/order/OrderInfoMapper.xml | 84 +++++++++++-------- 13 files changed, 119 insertions(+), 66 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubOperationQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubOperationQueryParam.java index 809f561..01d202f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubOperationQueryParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubOperationQueryParam.java @@ -24,4 +24,9 @@ public class AccSubOperationQueryParam extends BaseEntity { private Integer tradeType; private String searchValue; private String createBy; + + public AccSubOperationQueryParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java index 583d00a..1a98b63 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java @@ -28,4 +28,9 @@ public class AccountInfoQueryParam extends BaseEntity { // private BigDecimal walletMinAmount; // @ApiModelProperty("钱包最大金额") // private BigDecimal walletMaxAmount; + + public AccountInfoQueryParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java index 2354888..4ee896e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java @@ -41,12 +41,10 @@ public class OrderInfoController extends BaseController */ @PostMapping("/list") @ResponseBody - public TableDataInfo list(OrderQueryParam orderQueryParam) + public TableDataInfo list(@RequestBody @Valid OrderQueryParam orderQueryParam) { startPage(); - OrderInfo orderInfo = new OrderInfo(); - BeanUtils.copyProperties(orderQueryParam, orderInfo); - List list = orderInfoService.selectOrderInfoList(orderInfo); + List list = orderInfoService.selectOrderInfoList(orderQueryParam); return getDataTable(list); } @@ -55,9 +53,7 @@ public class OrderInfoController extends BaseController public TableDataInfo deviceList(@RequestBody @Valid OrderQueryParam orderQueryParam) { startPage(); - OrderInfo orderInfo = new OrderInfo(); - BeanUtils.copyProperties(orderQueryParam, orderInfo); - List list = orderInfoService.selectOrderInfoList(orderInfo); + List list = orderInfoService.selectOrderInfoList(orderQueryParam); return getDataTable(list); } @@ -92,9 +88,9 @@ public class OrderInfoController extends BaseController @SysLog(title = "订单", module = "订单", businessType = OperaType.EXPORT) @PostMapping("/export") @ResponseBody - public void export(OrderInfo orderInfo, HttpServletResponse response) + public void export(@RequestBody @Valid OrderQueryParam orderQueryParam, HttpServletResponse response) { - List list = orderInfoService.selectOrderInfoList(orderInfo); + List list = orderInfoService.selectOrderInfoList(orderQueryParam); ExcelUtil util = new ExcelUtil(OrderInfo.class); util.exportExcel(response, list, "订单数据"); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java index 9cf632c..52ea389 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderShoppingCartController.java @@ -45,12 +45,11 @@ public class OrderShoppingCartController extends BaseController */ @PostMapping("/list") @ResponseBody - public TableDataInfo list(@RequestBody OrderShoppingCartQueryParam orderShoppingCart) + public AjaxResult list(@RequestBody OrderShoppingCartQueryParam orderShoppingCart) { ShoppingCartParamChecker.listCheck(orderShoppingCart); - startPage(); List list = orderShoppingCartService.selectOrderShoppingCartList(orderShoppingCart); - return getDataTable(list); + return AjaxResult.success(list); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java index 8f70bca..5473ce2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java @@ -69,10 +69,18 @@ public class OrderInfo extends BaseEntity @Excel(name = "食堂id") private Long canteenId; + /** 食堂名称 */ + @Excel(name = "食堂名称") + private String canteenName; + /** 档口id */ @Excel(name = "档口id") private Long stallId; + /** 档口名称 */ + @Excel(name = "档口名称") + private String stallName; + /** 餐次类型 1-早餐 2-午餐 3-晚餐 4-下午茶 5-夜宵 */ @Excel(name = "餐次类型 1-早餐 2-午餐 3-晚餐 4-下午茶 5-夜宵") private Integer mealtimeType; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderQueryParam.java index 48b16eb..5fa3bf7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderQueryParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderQueryParam.java @@ -1,9 +1,15 @@ package com.bonus.canteen.core.order.domain.param; import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; import java.util.Date; /** @@ -14,13 +20,10 @@ import java.util.Date; */ @Data -public class OrderQueryParam +public class OrderQueryParam implements Serializable { private static final long serialVersionUID = 1L; - /** 订单号 */ - private Long orderId; - /** 设备订单号 */ private String deviceOrderId; @@ -31,7 +34,7 @@ public class OrderQueryParam private String deviceNum; /** 人员编号 */ - @Excel(name = "人员编号") + @NotNull(message = "用户ID不能为空") private Long userId; /** 身份验证方式 1 刷卡 2 刷脸 3 扫码 */ @@ -98,4 +101,20 @@ public class OrderQueryParam /** 评论状态 1 已评论 2 未评论 */ @Excel(name = "评论状态 1 已评论 2 未评论") private Integer commentState; + + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + private String searchValue; + + + public OrderQueryParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java index 5330504..c017239 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.order.mapper; import com.bonus.canteen.core.order.domain.OrderInfo; import com.bonus.canteen.core.order.domain.OrderPayResultDTO; +import com.bonus.canteen.core.order.domain.param.OrderQueryParam; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +30,7 @@ public interface OrderInfoMapper * @param orderInfo 订单 * @return 订单集合 */ - public List selectOrderInfoList(OrderInfo orderInfo); + public List selectOrderInfoList(OrderQueryParam orderQueryParam); /** * 新增订单 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/module/MenuModule.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/module/MenuModule.java index 1047cb7..10e6358 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/module/MenuModule.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/module/MenuModule.java @@ -24,8 +24,8 @@ public class MenuModule { public Map> getMenuRecipeDish(MenuDishCheckDTO menuDishCheckDTO) { MenuRecipe menuRecipe = new MenuRecipe(); menuRecipe.setApplyDate(menuDishCheckDTO.getApplyDate()); - menuRecipe.setCanteenIds(ListUtil.toList(menuDishCheckDTO.getCanteenId().toString())); - menuRecipe.setStallIds(ListUtil.toList(menuDishCheckDTO.getStallId().toString())); + menuRecipe.setCanteenId(menuDishCheckDTO.getCanteenId()); + menuRecipe.setStallId(menuDishCheckDTO.getStallId()); menuRecipe.setKey(menuDishCheckDTO.getApplyType()); Map> mealTimeTypeMap = new HashMap<>(); List menuRecipeList = menuRecipeService.selectMenuRecipeList(menuRecipe); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java index 9021b18..d9f9128 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java @@ -1,10 +1,7 @@ package com.bonus.canteen.core.order.service; import com.bonus.canteen.core.order.domain.OrderInfo; -import com.bonus.canteen.core.order.domain.param.DeviceOrderAddParam; -import com.bonus.canteen.core.order.domain.param.OrderAddParam; -import com.bonus.canteen.core.order.domain.param.OrderInfoAddParam; -import com.bonus.canteen.core.order.domain.param.ShopOrderAddParam; +import com.bonus.canteen.core.order.domain.param.*; import java.util.List; @@ -32,7 +29,7 @@ public interface IOrderInfoService * @param orderInfo 订单 * @return 订单集合 */ - public List selectOrderInfoList(OrderInfo orderInfo); + public List selectOrderInfoList(OrderQueryParam orderQueryParam); /** * 新增订单 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index 6955cf9..bedc1f6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -23,6 +23,7 @@ import com.bonus.canteen.core.order.domain.OrderPayDTO; import com.bonus.canteen.core.order.domain.OrderPayResultDTO; import com.bonus.canteen.core.order.domain.param.DeviceOrderAddParam; import com.bonus.canteen.core.order.domain.param.OrderAddParam; +import com.bonus.canteen.core.order.domain.param.OrderQueryParam; import com.bonus.canteen.core.order.domain.param.ShopOrderAddParam; import com.bonus.canteen.core.order.mapper.OrderInfoMapper; import com.bonus.canteen.core.order.service.IOrderDetailService; @@ -113,9 +114,18 @@ public class OrderInfoServiceImpl implements IOrderInfoService * @return 订单 */ @Override - public List selectOrderInfoList(OrderInfo orderInfo) + public List selectOrderInfoList(OrderQueryParam orderQueryParam) { - return orderInfoMapper.selectOrderInfoList(orderInfo); + List orderInfoList = orderInfoMapper.selectOrderInfoList(orderQueryParam); + if(CollUtil.isNotEmpty(orderInfoList)) { + orderInfoList.forEach(order -> { + OrderDetail orderDetail = new OrderDetail(); + orderDetail.setOrderId(order.getOrderId()); + List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); + order.setOrderDetailList(orderDetailList); + }); + } + return orderInfoList; } @Override diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index f395b6f..02fed8c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -395,7 +395,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN sys_user t2 ON t1.user_id = t2.user_id LEFT JOIN sys_dept t6 on t6.dept_id = t2.dept_id - order by t2.create_time desc + order by t1.acc_id desc +