赛事订单等待发票递送列表导出功能

src/main/java/com/ctrip/fun/golf/dao/order/EventActivityOrderExcelDao.java

@@ -130,6 +130,11 @@ public class EventActivityOrderExcelDao extends GenericHibernateDao<EventActivit
                 }
                 }
                 sb.append("(");
                 sb.append("(");
                 sb.append(orderStatusEnum.generateSql("od"));
                 sb.append(orderStatusEnum.generateSql("od"));
+                
+                if (orderStatusEnum.getName().equals(OrderStatusEnum.WAITING_INVOICE.getName())) {
+                    sb.append(" and  od.orderId in (select t.orderId from ord_invoiceinfo t where t.orderId=od.orderId)");
+                }
+                
                 sb.append(")");
                 sb.append(")");
                 index = index + 1;
                 index = index + 1;
             }
             }

src/main/java/com/ctrip/fun/golf/domain/order/EventActivityOrderListExcel.java

@@ -64,7 +64,7 @@ public class EventActivityOrderListExcel {
     private BigDecimal communeMinus;
     private BigDecimal communeMinus;
     private BigDecimal communeGuestPrice;
     private BigDecimal communeGuestPrice;
     private BigDecimal communeGuestMinus;
     private BigDecimal communeGuestMinus;
-    private BigDecimal floorPrice;
+    private double floorPrice;
     /**
     /**
      * 实付金额
      * 实付金额
      */
      */
@@ -277,11 +277,11 @@ public class EventActivityOrderListExcel {
 		this.voucherAmount = voucherAmount;
 		this.voucherAmount = voucherAmount;
 	}
 	}
 
 
-	public BigDecimal getFloorPrice() {
+	public double getFloorPrice() {
 		return floorPrice;
 		return floorPrice;
 	}
 	}
 
 
-	public void setFloorPrice(BigDecimal floorPrice) {
+	public void setFloorPrice(double floorPrice) {
 		this.floorPrice = floorPrice;
 		this.floorPrice = floorPrice;
 	}
 	}
 
 

src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java

@@ -881,6 +881,12 @@ public class OpEventActivityOrderService
                 Invoiceinfo invoiceinfo = this.findInvoiceinfo(orderListExcelBean.getOrderId(),
                 Invoiceinfo invoiceinfo = this.findInvoiceinfo(orderListExcelBean.getOrderId(),
                         invoiceinfos);
                         invoiceinfos);
                 
                 
+                if (invoiceinfo != null) {
+                    InvoiceBean invoice = new InvoiceBean();
+                    BeanConverter.copyProperties(invoice, invoiceinfo);
+                    orderListExcelBean.setInvoice(invoice);
+                }  
+
                 OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
                 OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
                         orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(),
                         orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(),
                         orderListExcelBean.getConfirmType(), orderListExcelBean.getProcessStatus(),
                         orderListExcelBean.getConfirmType(), orderListExcelBean.getProcessStatus(),