From b2d149c71483b4e5efeaabab1ad3111266a2245c Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 1 Jun 2021 22:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8=E4=BF=83?= =?UTF-8?q?=E9=94=80=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=9A=E6=8B=BC=E5=9B=A2=E3=80=81=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E3=80=81=E8=B5=A0=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/order/entity/dto/OrderSearchParams.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 8e561ce6..ba8a8fe6 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 @@ -67,8 +67,9 @@ public class OrderSearchParams extends PageVO { /** * @see OrderTypeEnum + * @see cn.lili.modules.order.order.entity.enums.OrderPromotionTypeEnum */ - @ApiModelProperty(value = "订单类型") + @ApiModelProperty(value = "订单类型",allowableValues = "NORMAL,VIRTUAL,GIFT,PINTUAN,POINT" ) private String orderType; @ApiModelProperty(value = "支付方式") @@ -136,7 +137,8 @@ public class OrderSearchParams extends PageVO { // 按订单类型 if (StringUtils.isNotEmpty(orderType)) { - wrapper.eq("o.order_type", orderType); + wrapper.eq("o.order_type", orderType) + .or().eq("o.order_promotion_type", orderType); } // 按支付方式