caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持使用促销类型进行筛选订单：拼团、积分、赠品

Browse Source
This commit is contained in:
lifenlong 2021-06-01 22:10:28 +08:00
parent f802810330
commit b2d149c714
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
View File

@ -67,8 +67,9 @@ public class OrderSearchParams extends PageVO {
/** /**
* @see OrderTypeEnum * @see OrderTypeEnum
* @see cn.lili.modules.order.order.entity.enums.OrderPromotionTypeEnum
*/ */
@ApiModelProperty(value = "订单类型") @ApiModelProperty(value = "订单类型",allowableValues = "NORMAL,VIRTUAL,GIFT,PINTUAN,POINT" )
private String orderType; private String orderType;
@ApiModelProperty(value = "支付方式") @ApiModelProperty(value = "支付方式")
@ -136,7 +137,8 @@ public class OrderSearchParams extends PageVO {
// 按订单类型 // 按订单类型
if (StringUtils.isNotEmpty(orderType)) { if (StringUtils.isNotEmpty(orderType)) {
wrapper.eq("o.order_type", orderType); wrapper.eq("o.order_type", orderType)
.or().eq("o.order_promotion_type", orderType);
} }
// 按支付方式 // 按支付方式