Commit c0123d50 by 蒋小洋

Merge branches 'ka-野翠山发票订单列表查询-20211011' and 'master' of…

Merge branches 'ka-野翠山发票订单列表查询-20211011' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
parents bcdfda81 9763c47f
...@@ -1228,9 +1228,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1228,9 +1228,6 @@ public class OrderServiceImpl implements Orderservice {
//查询可开票,支付状态为已支付 //查询可开票,支付状态为已支付
invoiceState = 1; invoiceState = 1;
queryOrdersRequest2.setPayStatus(new Integer[]{2}); queryOrdersRequest2.setPayStatus(new Integer[]{2});
List<Integer> bizTypes = new ArrayList<>(queryOrdersRequest2.getBizTypes());
bizTypes.add(BizTypeEnum.VIRTUAL.getBizType());
queryOrdersRequest2.setBizTypes(bizTypes);
}else if(Objects.equals(queryOrderVo.getNeedInvoice(),true)){ }else if(Objects.equals(queryOrderVo.getNeedInvoice(),true)){
//查询已开票 //查询已开票
invoiceState = 2; invoiceState = 2;
......
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