add orderNO,order contactName and orderName for query and add exported columns

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceBean.java

@@ -132,6 +132,42 @@ public class CourseOrderFinanceBean {
     private BigDecimal commission;
     private BigDecimal commission;
 
 
     private Integer resourceId;// 资源ID
     private Integer resourceId;// 资源ID
+    
+    private String uid;
+    private String contactName ;
+    private String orderName ;
+    private Integer districtId ;
+    private String districtName ;
+    private BigDecimal actualAmount ;
+    private Date orderDate ;
+    private Date payDate ;
+    private Integer orderSource ;
+    private BigDecimal actualSettleAmout ;
+    private String settleObj ;
+    private Date settleDate ;
+    private String finComment ;
+    private BigDecimal prePayCardAmount ;
+    private BigDecimal voucherAmount ;
+    private BigDecimal refundAmount ;
+    private String outTradeId ;
+    private Boolean onlineOrderFlag ;
+    private String userType ;
+    private Double insuranceAmount ;
+    private String channel1 ;
+    private String channel2 ;
+	
+    private Integer playerNum;
+    private String player1;
+    private String player2;
+    private String player3;
+    private String player4;
+    
+    
+    
+    
+    
+    
+    
 
 
     @ExcelTitleName(value = "球场ID", number = 5)
     @ExcelTitleName(value = "球场ID", number = 5)
     public Integer getCourseId() {
     public Integer getCourseId() {
@@ -175,7 +211,7 @@ public class CourseOrderFinanceBean {
         return playNums;
         return playNums;
     }
     }
 
 
-    @ExcelTitleName(value = "单人成本", number = 45)
+    @ExcelTitleName(value = "单人成本/底价", number = 45)
     public double getCostForPerson() {
     public double getCostForPerson() {
         return costForPerson;
         return costForPerson;
     }
     }
@@ -378,5 +414,254 @@ public class CourseOrderFinanceBean {
     public void setResourceId(Integer resourceId) {
     public void setResourceId(Integer resourceId) {
         this.resourceId = resourceId;
         this.resourceId = resourceId;
     }
     }
+    
+	public String getUid() {
+		return uid;
+	}
 
 
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+    @ExcelTitleName(value = "联系人", number = 20)
+	public String getContactName() {
+		return contactName;
+	}
+
+	public void setContactName(String contactName) {
+		this.contactName = contactName;
+	}
+
+    @ExcelTitleName(value = "订单名称", number = 100)
+	public String getOrderName() {
+		return orderName;
+	}
+
+	public void setOrderName(String orderName) {
+		this.orderName = orderName;
+	}
+
+	public Integer getDistrictId() {
+		return districtId;
+	}
+
+	public void setDistrictId(Integer districtId) {
+		this.districtId = districtId;
+	}
+
+	@ExcelTitleName(value = "城市", number = 12)
+    public String getDistrictName() {
+		return districtName;
+	}
+
+	public void setDistrictName(String districtName) {
+		this.districtName = districtName;
+	}
+
+	@ExcelTitleName(value = "实付金额", number = 12)
+	public BigDecimal getActualAmount() {
+		return actualAmount;
+	}
+
+	public void setActualAmount(BigDecimal actualAmount) {
+		this.actualAmount = actualAmount;
+	}
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelTitleName(value = "下单时间", number = 20)
+	public Date getOrderDate() {
+		return orderDate;
+	}
+
+	public void setOrderDate(Date orderDate) {
+		this.orderDate = orderDate;
+	}
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelTitleName(value = "支付时间", number = 20)
+	public Date getPayDate() {
+		return payDate;
+	}
+
+	public void setPayDate(Date payDate) {
+		this.payDate = payDate;
+	}
+
+	public Integer getOrderSource() {
+		return orderSource;
+	}
+
+	public void setOrderSource(Integer orderSource) {
+		this.orderSource = orderSource;
+	}
+
+    @ExcelTitleName(value = "实际结算金额", number = 12)
+	public BigDecimal getActualSettleAmout() {
+		return actualSettleAmout;
+	}
+
+	public void setActualSettleAmout(BigDecimal actualSettleAmout) {
+		this.actualSettleAmout = actualSettleAmout;
+	}
+
+    @ExcelTitleName(value = "结算对象", number = 128)
+	public String getSettleObj() {
+		return settleObj;
+	}
+
+	public void setSettleObj(String settleObj) {
+		this.settleObj = settleObj;
+	}
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ExcelTitleName(value = "结算日期", number = 20)
+	public Date getSettleDate() {
+		return settleDate;
+	}
+
+	public void setSettleDate(Date settleDate) {
+		this.settleDate = settleDate;
+	}
+
+    @ExcelTitleName(value = "财务备注", number = 256)
+	public String getFinComment() {
+		return finComment;
+	}
+
+	public void setFinComment(String finComment) {
+		this.finComment = finComment;
+	}
+
+    @ExcelTitleName(value = "余额", number = 12)
+	public BigDecimal getPrePayCardAmount() {
+		return prePayCardAmount;
+	}
+
+	public void setPrePayCardAmount(BigDecimal prePayCardAmount) {
+		this.prePayCardAmount = prePayCardAmount;
+	}
+
+    @ExcelTitleName(value = "兑换卷", number = 12)
+	public BigDecimal getVoucherAmount() {
+		return voucherAmount;
+	}
+
+	public void setVoucherAmount(BigDecimal voucherAmount) {
+		this.voucherAmount = voucherAmount;
+	}
+
+    @ExcelTitleName(value = "退款金额", number = 12)
+	public BigDecimal getRefundAmount() {
+		return refundAmount;
+	}
+
+	public void setRefundAmount(BigDecimal refundAmount) {
+		this.refundAmount = refundAmount;
+	}
+
+    @ExcelTitleName(value = "携程支付订单编号", number = 64)
+	public String getOutTradeId() {
+		return outTradeId;
+	}
+
+	public void setOutTradeId(String outTradeId) {
+		this.outTradeId = outTradeId;
+	}
+
+    @ExcelTitleName(value = "是否线上订单", number = 12)
+	public Boolean getOnlineOrderFlag() {
+		return onlineOrderFlag;
+	}
+
+	public void setOnlineOrderFlag(Boolean onlineOrderFlag) {
+		this.onlineOrderFlag = onlineOrderFlag;
+	}
+
+    @ExcelTitleName(value = "用户类型（活跃用户，非活跃用户，新用户未下单）", number = 20)
+	public String getUserType() {
+		return userType;
+	}
+
+	public void setUserType(String userType) {
+		this.userType = userType;
+	}
+
+    @ExcelTitleName(value = "保险金额", number = 12)
+	public Double getInsuranceAmount() {
+		return insuranceAmount;
+	}
+
+	public void setInsuranceAmount(Double insuranceAmount) {
+		this.insuranceAmount = insuranceAmount;
+	}
+
+    @ExcelTitleName(value = "后台下单渠道1", number = 12)
+	public String getChannel1() {
+		return channel1;
+	}
+
+	public void setChannel1(String channel1) {
+		this.channel1 = channel1;
+	}
+
+    @ExcelTitleName(value = "后台下单渠道2", number = 12)
+	public String getChannel2() {
+		return channel2;
+	}
+
+	public void setChannel2(String channel2) {
+		this.channel2 = channel2;
+	}
+
+    @ExcelTitleName(value = "打球人数", number = 12)
+	public Integer getPlayerNum() {
+		return playerNum;
+	}
+
+	public void setPlayerNum(Integer playerNum) {
+		this.playerNum = playerNum;
+	}
+
+    @ExcelTitleName(value = "打球人1", number = 12)
+	public String getPlayer1() {
+		return player1;
+	}
+
+	public void setPlayer1(String player1) {
+		this.player1 = player1;
+	}
+
+    @ExcelTitleName(value = "打球人2", number = 12)
+	public String getPlayer2() {
+		return player2;
+	}
+
+	public void setPlayer2(String player2) {
+		this.player2 = player2;
+	}
+
+    @ExcelTitleName(value = "打球人3", number = 12)
+	public String getPlayer3() {
+		return player3;
+	}
+
+	public void setPlayer3(String player3) {
+		this.player3 = player3;
+	}
+
+    @ExcelTitleName(value = "打球人4", number = 12)
+	public String getPlayer4() {
+		return player4;
+	}
+
+	public void setPlayer4(String player4) {
+		this.player4 = player4;
+	}
+
+    
+    
+    
 }
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceQuery.java

@@ -68,6 +68,11 @@ public class CourseOrderFinanceQuery extends AbstractPagedQuery {
      * 产品经理
      * 产品经理
      */
      */
     private String productManager;
     private String productManager;
+    
+    private Long  orderNo;
+    private String contactName;
+    private String orderName;
+    
 
 
     public Integer getCourseId() {
     public Integer getCourseId() {
         return courseId;
         return courseId;
@@ -169,4 +174,28 @@ public class CourseOrderFinanceQuery extends AbstractPagedQuery {
         this.productManager = productManager;
         this.productManager = productManager;
     }
     }
 
 
+	public Long getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(Long orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getContactName() {
+		return contactName;
+	}
+
+	public void setContactName(String contactName) {
+		this.contactName = contactName;
+	}
+
+	public String getOrderName() {
+		return orderName;
+	}
+
+	public void setOrderName(String orderName) {
+		this.orderName = orderName;
+	}
+
 }
 }