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

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

@@ -16,6 +16,15 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  */
 @JsonIgnoreProperties(ignoreUnknown = true, value = { "specTypeString", "feeTypeString", "payTypeString" })
 public class InvoiceBean {
+	
+    /**
+     * 发票创建时间
+     */
+	private Long createTime;
+    /**
+     * 发票是否已经寄出
+     */
+	private Character isSend;
     /**
      * 发票号
      */
@@ -25,6 +34,10 @@ public class InvoiceBean {
      */
     private Integer orderId;
     /**
+     * 添加的发票涉及到的订单
+     */
+    private Integer[] orderIds;
+    /**
      * 发票类型
      */
     private Character specType;
@@ -58,6 +71,16 @@ public class InvoiceBean {
      */
     private String mobileNo;
     /**
+     * 申请开票人uid
+     */
+    private String uid;
+    
+    /**
+     * 成本
+     */    
+    private String costAmount;
+    
+    /**
      * 金额
      */
     private BigDecimal amount;
@@ -334,4 +357,44 @@ public class InvoiceBean {
 		this.taxIdBankAccount = taxIdBankAccount;
 	}
 
+	public Integer[] getOrderIds() {
+		return orderIds;
+	}
+
+	public void setOrderIds(Integer[] orderIds) {
+		this.orderIds = orderIds;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getCostAmount() {
+		return costAmount;
+	}
+
+	public void setCostAmount(String costAmount) {
+		this.costAmount = costAmount;
+	}
+
+	public Character getIsSend() {
+		return isSend;
+	}
+
+	public void setIsSend(Character isSend) {
+		this.isSend = isSend;
+	}
+
+	public Long getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Long createTime) {
+		this.createTime = createTime;
+	}
+	
 }

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

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.common.vo.order;
+
+import com.ctrip.fun.common.vo.AbstractPagedQuery;
+
+/**
+ * @author zgsong
+ * @version 1.0.0
+ */
+@SuppressWarnings("rawtypes")
+public class InvoiceinfoQuery extends AbstractPagedQuery {
+    private static final long serialVersionUID = 5283356401994449858L;
+
+    private String uid;
+
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+	public String getUid() {
+		return uid;
+	}
+
+}

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

@@ -66,8 +66,20 @@ public class OrderListBean {
      * 新加属性兑换卷
      */  
     private BigDecimal voucherAmount;
+    /**
+     * 预付金额
+     */  
+    private BigDecimal prePayAmount;
+    /**
+     * 发票金额
+     */      
+    private BigDecimal invoiceAmount;
+    /**
+     * 保险金额
+     */
+    private BigDecimal insuranceAmount;
+    
     
-
 
     private BigDecimal giftCardAmount;
 
@@ -358,4 +370,30 @@ public class OrderListBean {
         this.isInvoiceDesc = isInvoiceDesc;
     }
 
+	public BigDecimal getPrePayAmount() {
+		return prePayAmount;
+	}
+
+	public void setPrePayAmount(BigDecimal prePayAmount) {
+		this.prePayAmount = prePayAmount;
+	}
+
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
+
+	public BigDecimal getInsuranceAmount() {
+		return insuranceAmount;
+	}
+
+	public void setInsuranceAmount(BigDecimal insuranceAmount) {
+		this.insuranceAmount = insuranceAmount;
+	}
+    
+    
+
 }