Skip to content

O
order-group
Commit 6c60d97a by 周晓航
Options

Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into qa

parents ae837897 0a809bd3
Showing with 3 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -1095,7 +1095,6 @@ public class OrderAdapter { ...@@ -1095,7 +1095,6 @@ public class OrderAdapter {
// queryOrdersDto.setType(new Integer[]{}); // queryOrdersDto.setType(new Integer[]{});
} }
//商品订单和卖券订单 //商品订单和卖券订单
queryOrdersDto.setBizTypes(Arrays.asList(1, 6));
queryOrdersDto.setBizTypes(Arrays.asList(BizTypeEnum.ORDINARY.getBizType(), queryOrdersDto.setBizTypes(Arrays.asList(BizTypeEnum.ORDINARY.getBizType(),
BizTypeEnum.SALE_COUPON.getBizType(), BizTypeEnum.SALE_COUPON.getBizType(),
BizTypeEnum.ADVANCE_ORDER.getBizType())); BizTypeEnum.ADVANCE_ORDER.getBizType()));
...@@ -4309,7 +4308,9 @@ public class OrderAdapter { ...@@ -4309,7 +4308,9 @@ public class OrderAdapter {
// queryOrdersDto.setType(new Integer[]{}); // queryOrdersDto.setType(new Integer[]{});
} }
//商品订单和卖券订单 //商品订单和卖券订单
queryOrdersDto.setBizTypes(Arrays.asList(1, 6)); queryOrdersDto.setBizTypes(Arrays.asList(BizTypeEnum.ORDINARY.getBizType(),
BizTypeEnum.SALE_COUPON.getBizType(),
BizTypeEnum.ADVANCE_ORDER.getBizType()));
// 新老兼容 // 新老兼容
if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) { if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment