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

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1095,7 +1095,6 @@ public class OrderAdapter {
 //            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()));
@@ -4309,7 +4308,9 @@ public class OrderAdapter {
 //            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()) {