Merge branch 'f-6.6.8' of 192.168.10.6:caosy/fun-common into f-6.6.8

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/EventActivityOrderListExcelBean.java

@@ -56,7 +56,7 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
     private BigDecimal communeMinus;
     private BigDecimal communeGuestPrice;
     private BigDecimal communeGuestMinus;
-    private BigDecimal floorPrice;
+    private Double floorPrice;
     /**
      * 实付金额
      */
@@ -75,6 +75,19 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
     private BigDecimal voucherAmount;
     
     /**
+     * 在线支付退款金额
+     */
+    private BigDecimal refundAmount;
+    /**
+     * 优惠券退款金额
+     */
+    private BigDecimal voucherRefundAmount;
+    /**
+     * 余额退款金额
+     */
+    private BigDecimal prePayCardRefundAmount;  
+    
+    /**
      * 保险
      * */
     private BigDecimal insuranceAmount;
@@ -242,11 +255,11 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
 		this.insuranceAmount = insuranceAmount;
 	}
 
-	public BigDecimal getFloorPrice() {
+	public Double getFloorPrice() {
 		return floorPrice;
 	}
 
-	public void setFloorPrice(BigDecimal floorPrice) {
+	public void setFloorPrice(Double floorPrice) {
 		this.floorPrice = floorPrice;
 	}
 
@@ -274,4 +287,28 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
         this.contactTel = contactTel;
     }
 
+	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;
+	}
+
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/EventActivityOrderMenuEnum.java

@@ -49,10 +49,20 @@ public enum EventActivityOrderMenuEnum {
     LIST_REFUND_SUCCESS("list_refundsuccess", "全部退款成功", "/eventActivityOrder/orderList/list_refundsuccess", "eventActivityOrderListRefundsuccess", Arrays
             .asList(OrderStatusEnum.TOTAL_REFUND)),
 
+            
+    /**
+    * 等待发票递送
+    */
+    LIST_INVOICE("list_invoice", "等待发票递送", "/eventActivityOrder/orderList/list_invoice", "eventActivityOrderListInvoice",Arrays.asList(OrderStatusEnum.WAITING_INVOICE)), 
+    
+    
+    
     /**
      * 已取消
      */
     LIST_CANCELED("list_canceled", "已取消", "/eventActivityOrder/orderList/list_canceled", "eventActivityOrderListCanceled", Arrays.asList(OrderStatusEnum.CANCEL));
+    
+
 
     /**
      * Menu名称