赛事订单增加待送发票订单列表功能；赛事订单导出增加显示各种退款金额

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

@@ -47,7 +47,9 @@ public class EventActivityOrderExcelDao extends GenericHibernateDao<EventActivit
             + ",od.settleDate"
             + ",od.settleDate"
             + ",od.finComment"
             + ",od.finComment"
             + ",od.prePayCardAmount"
             + ",od.prePayCardAmount"
-            + ",od.voucherAmount"
+            + ",od.voucherAmount" 
+            + ",od.voucherRefundAmount"
+            + ",od.prePayCardRefundAmount"
             + ",od.refundAmount"
             + ",od.refundAmount"
             + ",od.insuranceAmount"
             + ",od.insuranceAmount"
             + ",od.outTradeId"
             + ",od.outTradeId"

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

@@ -1704,6 +1704,11 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
                 }
                 }
                 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

@@ -81,7 +81,18 @@ public class EventActivityOrderListExcel {
      * 新加属性兑换卷
      * 新加属性兑换卷
      */  
      */  
     private BigDecimal voucherAmount;
     private BigDecimal voucherAmount;
-    
+    /**
+     * 在线支付退款金额
+     */
+    private BigDecimal refundAmount;
+    /**
+     * 优惠券退款金额
+     */
+    private BigDecimal voucherRefundAmount;
+    /**
+     * 余额退款金额
+     */
+    private BigDecimal prePayCardRefundAmount;  
     /**
     /**
      * 保险
      * 保险
      * */
      * */
@@ -334,4 +345,28 @@ public class EventActivityOrderListExcel {
         this.playDate = playDate;
         this.playDate = playDate;
     }
     }
 
 
+	public BigDecimal getRefundAmount() {
+		return refundAmount;
+	}
+
+	public void setRefundAmount(BigDecimal refundAmount) {
+		this.refundAmount = refundAmount;
+	}
+
+	public BigDecimal getVoucherRefundAmount() {
+		return voucherRefundAmount;
+	}
+
+	public void setVoucherRefundAmount(BigDecimal voucherRefundAmount) {
+		this.voucherRefundAmount = voucherRefundAmount;
+	}
+
+	public BigDecimal getPrePayCardRefundAmount() {
+		return prePayCardRefundAmount;
+	}
+
+	public void setPrePayCardRefundAmount(BigDecimal prePayCardRefundAmount) {
+		this.prePayCardRefundAmount = prePayCardRefundAmount;
+	}
+
 }
 }

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

@@ -917,6 +917,9 @@ public class OpEventActivityOrderService
         bean.setPrePayAmount(xsl.getPrePayAmount());
         bean.setPrePayAmount(xsl.getPrePayAmount());
         bean.setPrePayCardAmount(xsl.getPrePayCardAmount());
         bean.setPrePayCardAmount(xsl.getPrePayCardAmount());
         bean.setVoucherAmount(xsl.getVoucherAmount());
         bean.setVoucherAmount(xsl.getVoucherAmount());
+        bean.setRefundAmount(xsl.getRefundAmount());
+        bean.setVoucherRefundAmount(xsl.getVoucherRefundAmount());
+        bean.setPrePayCardRefundAmount(xsl.getPrePayCardRefundAmount());
         bean.setInsuranceAmount(xsl.getInsuranceAmount());
         bean.setInsuranceAmount(xsl.getInsuranceAmount());
         bean.setFloorPrice(xsl.getFloorPrice());
         bean.setFloorPrice(xsl.getFloorPrice());
         bean.setRemark(xsl.getRemark());
         bean.setRemark(xsl.getRemark());