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); } // 按支付方式