增加发票递送方式和递送费相关信息

src/main/java/com/ctrip/fun/golf/dao/basic/InvoiceRequestDao.java

@@ -17,7 +17,7 @@ public class InvoiceRequestDao extends GenericHibernateDao<InvoiceRequest, Integ
     	InvoiceRequestQuery queryBean = (InvoiceRequestQuery) queryCon;
         StringBuilder sb = new StringBuilder(300);
 
-        sb.append("SELECT SQL_CALC_FOUND_ROWS distinct a.id,costOfDepart,invoiceTitle,taxIdNum,contactName,contactTel,contactAddress,invoiceRemark,expressNo,refusedReason,sendTime,refusedReason,createTime,`status`,salesRemark,requestPerson");
+        sb.append("SELECT SQL_CALC_FOUND_ROWS distinct a.sendWay,a.payInfo,a.id,costOfDepart,invoiceTitle,taxIdNum,contactName,contactTel,contactAddress,invoiceRemark,expressNo,refusedReason,sendTime,refusedReason,createTime,`status`,salesRemark,requestPerson");
         sb.append(" FROM ord_invoicerequest a LEFT JOIN ord_invoiceorderinfo b on (a.id=b.requestId)");
         sb.append("where 1=1 ");
         Map<String, Object> parameters = new HashMap<String, Object>();
@@ -76,7 +76,7 @@ public class InvoiceRequestDao extends GenericHibernateDao<InvoiceRequest, Integ
     	InvoiceRequestQuery queryBean = (InvoiceRequestQuery) queryCon;
         StringBuilder sb = new StringBuilder(300);
 
-        sb.append("SELECT distinct a.id,costOfDepart,invoiceTitle,taxIdNum,contactName,contactTel,contactAddress,invoiceRemark,expressNo,refusedReason,sendTime,refusedReason,createTime,`status`,salesRemark,requestPerson");
+        sb.append("SELECT distinct a.sendWay,a.payInfo,a.id,costOfDepart,invoiceTitle,taxIdNum,contactName,contactTel,contactAddress,invoiceRemark,expressNo,refusedReason,sendTime,refusedReason,createTime,`status`,salesRemark,requestPerson");
         sb.append(" FROM ord_invoicerequest a LEFT JOIN ord_invoiceorderinfo b on (a.id=b.requestId)");
         sb.append("where 1=1 ");
         Map<String, Object> parameters = new HashMap<String, Object>();

src/main/java/com/ctrip/fun/golf/domain/basic/InvoiceRequest.java

@@ -69,8 +69,10 @@ public class InvoiceRequest implements java.io.Serializable {
       
     //销售备注
     private String  salesRemark;
-    
-    
+    //寄送方式：到付、寄送
+    private String  sendWay;    
+    //到付，付款信息
+    private String  payInfo;   
     @Id
     @GeneratedValue(strategy = IDENTITY)
     @Column(name = "ID", unique = true)
@@ -210,6 +212,24 @@ public class InvoiceRequest implements java.io.Serializable {
 		this.salesRemark = salesRemark;
 	}
 
+	@Column(name = "sendWay")
+	public String getSendWay() {
+		return sendWay;
+	}
+
+	public void setSendWay(String sendWay) {
+		this.sendWay = sendWay;
+	}
+
+	@Column(name = "payInfo")
+	public String getPayInfo() {
+		return payInfo;
+	}
+
+	public void setPayInfo(String payInfo) {
+		this.payInfo = payInfo;
+	}
+
 
 	
 }