From 2db8eb73244224ad6a60d9c500f8079e6f53ae81 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 21 Jun 2021 15:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/common/utils/DateUtil.java | 13 ++- .../order/entity/dto/OrderSearchParams.java | 99 ++++++++----------- 2 files changed, 49 insertions(+), 63 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/utils/DateUtil.java b/framework/src/main/java/cn/lili/common/utils/DateUtil.java index dcb4c89a..a5078149 100644 --- a/framework/src/main/java/cn/lili/common/utils/DateUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/DateUtil.java @@ -87,6 +87,9 @@ public class DateUtil { * @return */ public static Date endOfDate(Date date) { + if (date == null) { + date = new Date(); + } Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.set(Calendar.HOUR_OF_DAY, 23); @@ -194,21 +197,23 @@ public class DateUtil { /** * 把日期转换成字符串型 * - * @param date 日期 + * @param date 日期 * @return */ public static String toString(Date date) { - return toString(date,STANDARD_FORMAT); + return toString(date, STANDARD_FORMAT); } + /** * 把日期转换成字符串型 * - * @param Long 日期 + * @param Long 日期 * @return */ public static String toString(Long date) { - return toString(date,STANDARD_FORMAT); + return toString(date, STANDARD_FORMAT); } + /** * 把日期转换成字符串型 * diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java index f93c77fd..888a80b4 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java @@ -69,7 +69,7 @@ public class OrderSearchParams extends PageVO { * @see OrderTypeEnum * @see cn.lili.modules.order.order.entity.enums.OrderPromotionTypeEnum */ - @ApiModelProperty(value = "订单类型",allowableValues = "NORMAL,VIRTUAL,GIFT,PINTUAN,POINT" ) + @ApiModelProperty(value = "订单类型", allowableValues = "NORMAL,VIRTUAL,GIFT,PINTUAN,POINT") private String orderType; @ApiModelProperty(value = "支付方式") @@ -98,53 +98,60 @@ public class OrderSearchParams extends PageVO { //关键字查询 if (StringUtils.isNotEmpty(keywords)) { - wrapper.like("o.sn", keywords); - wrapper.like("oi.goods_name", keywords); + wrapper.and(queryWrapper -> wrapper.like("o.sn", keywords).or(). + like("oi.goods_name", keywords)); } //按卖家查询 - if (StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) { - wrapper.eq("o.store_id", UserContext.getCurrentUser().getStoreId()); - } - if (StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name()) - && StringUtils.isNotEmpty(storeId)) { - wrapper.eq("o.store_id", storeId); - } + wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), "o.store_id", UserContext.getCurrentUser().getStoreId()); + + //店铺查询 + wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name()) + && StringUtils.isNotEmpty(storeId), "o.store_id", storeId); + //按买家查询 - if (StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) { - wrapper.eq("o.member_id", UserContext.getCurrentUser().getId()); - } + wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name()), "o.member_id", UserContext.getCurrentUser().getId()); + //按照买家查询 - if (StringUtils.isNotEmpty(memberId)) { - wrapper.like("o.member_id", memberId); - } + wrapper.like(StringUtils.isNotEmpty(memberId), "o.member_id", memberId); //按订单编号查询 - if (StringUtils.isNotEmpty(orderSn)) { - wrapper.like("o.sn", orderSn); - } + wrapper.like(StringUtils.isNotEmpty(orderSn), "o.sn", orderSn); //按时间查询 - if (startDate != null) { - wrapper.ge("o.create_time", startDate); - } - if (endDate != null) { - wrapper.le("o.create_time", DateUtil.endOfDate(endDate)); - } + wrapper.ge(startDate != null, "o.create_time", startDate); + + wrapper.le(endDate != null, "o.create_time", DateUtil.endOfDate(endDate)); //按购买人用户名 - if (StringUtils.isNotEmpty(buyerName)) { - wrapper.like("o.member_name", buyerName); - } + wrapper.like(StringUtils.isNotEmpty(buyerName), "o.member_name", buyerName); //按订单类型 if (StringUtils.isNotEmpty(orderType)) { - wrapper.eq("o.order_type", orderType) - .or().eq("o.order_promotion_type", orderType); + wrapper.and(queryWrapper-> queryWrapper.eq("o.order_type", orderType).or() + .eq("o.order_promotion_type", orderType)); } + + //物流查询 + wrapper.like(StringUtils.isNotEmpty(shipName), "o.ship_name", shipName); + + //按商品名称查询 + wrapper.like(StringUtils.isNotEmpty(goodsName), "oi.goods_name", goodsName); + + //付款方式 + wrapper.like(StringUtils.isNotEmpty(paymentType), "o.payment_type", paymentType); + //按支付方式 - if (StringUtils.isNotEmpty(paymentMethod)) { - wrapper.eq("o.payment_method", paymentMethod); - } + wrapper.eq(StringUtils.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod); + + //订单状态 + wrapper.eq(StringUtils.isNotEmpty(orderStatus), "o.order_status", orderStatus); + + //付款状态 + wrapper.eq(StringUtils.isNotEmpty(payStatus), "o.pay_status", payStatus); + + //订单来源 + wrapper.like(StringUtils.isNotEmpty(clientType), "o.client_type", clientType); + //按标签查询 if (StringUtils.isNotEmpty(tag)) { @@ -176,33 +183,7 @@ public class OrderSearchParams extends PageVO { } } - if (StringUtils.isNotEmpty(shipName)) { - wrapper.like("o.ship_name", shipName); - } - //按商品名称查询 - if (StringUtils.isNotEmpty(goodsName)) { - wrapper.like("oi.goods_name", goodsName); - } - //付款方式 - if (StringUtils.isNotEmpty(paymentType)) { - wrapper.like("o.payment_type", paymentType); - } - - //订单状态 - if (StringUtils.isNotEmpty(orderStatus)) { - wrapper.eq("o.order_status", orderStatus); - } - - //付款状态 - if (StringUtils.isNotEmpty(payStatus)) { - wrapper.eq("o.pay_status", payStatus); - } - - //订单来源 - if (StringUtils.isNotEmpty(clientType)) { - wrapper.like("o.client_type", clientType); - } wrapper.eq("o.delete_flag", false); return wrapper; }