Skip to content

caosy / fun-common

Go to a project
Commit 8bfe585d by Huang Linyu
Options

add costAll

parent 2693500b
Inline Side-by-side
Showing with 121 additions and 112 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceBean.java
...@@ -164,7 +164,7 @@ public class CourseOrderFinanceBean { ...@@ -164,7 +164,7 @@ public class CourseOrderFinanceBean {
private String payeeName; private String payeeName;
private String receiver; private String receiver;
private double costAll;
...@@ -173,19 +173,29 @@ public class CourseOrderFinanceBean { ...@@ -173,19 +173,29 @@ public class CourseOrderFinanceBean {
return courseId; return courseId;
} }
@ExcelTitleName(value = "订单号", number = 2)
public Long getOrderNo() {
return orderNo;
}
@ExcelTitleName(value = "联系人", number = 3)
public String getContactName() {
return contactName;
}
@ExcelTitleName(value = "订单名称", number = 4)
public String getOrderName() {
return orderName;
}
@ExcelTitleName(value = "球场名称", number = 5) @ExcelTitleName(value = "球场名称", number = 5)
public String getCourseName() { public String getCourseName() {
return courseName; return courseName;
} }
@ExcelTitleName(value = "供应商ID", number = 30) @ExcelTitleName(value = "城市", number = 6)
public String getSupplierId() { public String getDistrictName() {
return supplierId; return districtName;
}
@ExcelTitleName(value = "供应商", number = 31)
public String getSupplierName() {
return supplierName;
} }
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
...@@ -195,21 +205,76 @@ public class CourseOrderFinanceBean { ...@@ -195,21 +205,76 @@ public class CourseOrderFinanceBean {
return playDate; return playDate;
} }
@ExcelTitleName(value = "支付方式", number = 8)
public String getPayMode() {
return payMode;
}
// @ExcelTitleName(value = "TEETIME", number = 46) // @ExcelTitleName(value = "TEETIME", number = 46)
public String getTeeTime() { public String getTeeTime() {
return teeTime; return teeTime;
} }
@ExcelTitleName(value = "订单号", number = 2)
public Long getOrderNo() {
return orderNo;
}
@ExcelTitleName(value = "单人成本/底价", number = 9) @ExcelTitleName(value = "单人成本/底价", number = 9)
public double getCostForPerson() { public double getCostForPerson() {
return costForPerson; return costForPerson;
} }
@ExcelTitleName(value = "总成本", number = 10)
public double getCostAll() {
return costAll;
}
@ExcelTitleName(value = "实际结算金额", number = 11)
public BigDecimal getActualSettleAmout() {
return actualSettleAmout;
}
@ExcelTitleName(value = "实付金额", number = 12)
public BigDecimal getActualAmount() {
return actualAmount;
}
@ExcelTitleName(value = "返佣", number = 13)
public BigDecimal getCommission() {
return commission;
}
@ExcelTitleName(value = "返现", number = 14)
public BigDecimal getCashRebate() {
return cashRebate;
}
@ExcelTitleName(value = "保险金额", number = 15)
public Double getInsuranceAmount() {
return insuranceAmount;
}
@ExcelTitleName(value = "退款金额", number = 16)
public BigDecimal getRefundAmount() {
return refundAmount;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "下单时间", number = 17)
public Date getOrderDate() {
return orderDate;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "支付时间", number = 18)
public Date getPayDate() {
return payDate;
}
@ExcelTitleName(value = "是否线上订单", number = 19)
public Boolean getOnlineOrderFlag() {
return onlineOrderFlag;
}
// @ExcelTitleName(value = "订单总成本", number = 48) // @ExcelTitleName(value = "订单总成本", number = 48)
public double getCostForOrder() { public double getCostForOrder() {
return costForOrder; return costForOrder;
...@@ -220,46 +285,72 @@ public class CourseOrderFinanceBean { ...@@ -220,46 +285,72 @@ public class CourseOrderFinanceBean {
return playNames; return playNames;
} }
@ExcelTitleName(value = "订单状态", number = 19) @ExcelTitleName(value = "订单状态", number = 20)
public String getOrderStatus() { public String getOrderStatus() {
return orderStatus; return orderStatus;
} }
@ExcelTitleName(value = "支付方式", number = 8) @ExcelTitleName(value = "接管人", number = 21)
public String getPayMode() { public String getReceiver() {
return payMode; return receiver;
}
@ExcelTitleName(value = "收款人", number = 22)
public String getPayeeName() {
return payeeName;
} }
@ExcelTitleName(value = "打球人数", number = 22) @ExcelTitleName(value = "打球人数", number = 23)
public int getPlayNums() { public int getPlayNums() {
return playNums; return playNums;
} }
@ExcelTitleName(value = "打球人1", number = 23) @ExcelTitleName(value = "打球人1", number = 24)
public String getPlayer1() { public String getPlayer1() {
return player1; return player1;
} }
@ExcelTitleName(value = "打球人2", number = 24) @ExcelTitleName(value = "打球人2", number = 25)
public String getPlayer2() { public String getPlayer2() {
return player2; return player2;
} }
@ExcelTitleName(value = "打球人3", number = 25) @ExcelTitleName(value = "打球人3", number = 26)
public String getPlayer3() { public String getPlayer3() {
return player3; return player3;
} }
@ExcelTitleName(value = "打球人4", number = 26) @ExcelTitleName(value = "打球人4", number = 27)
public String getPlayer4() { public String getPlayer4() {
return player4; return player4;
} }
@ExcelTitleName(value = "结算对象", number = 28)
public String getSettleObj() {
return settleObj;
}
@ExcelTitleName(value = "保险金额", number = 14) @DateTimeFormat(pattern = "yyyy-MM-dd")
public Double getInsuranceAmount() { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
return insuranceAmount; @ExcelTitleName(value = "结算日期", number = 29)
public Date getSettleDate() {
return settleDate;
}
@ExcelTitleName(value = "财务备注", number = 30)
public String getFinComment() {
return finComment;
}
@ExcelTitleName(value = "供应商ID", number = 31)
public String getSupplierId() {
return supplierId;
}
@ExcelTitleName(value = "供应商", number = 32)
public String getSupplierName() {
return supplierName;
} }
// @ExcelTitleName(value = "后台下单渠道1", number = 40) // @ExcelTitleName(value = "后台下单渠道1", number = 40)
...@@ -272,16 +363,6 @@ public class CourseOrderFinanceBean { ...@@ -272,16 +363,6 @@ public class CourseOrderFinanceBean {
return channel2; return channel2;
} }
@ExcelTitleName(value = "收款人", number = 21)
public String getPayeeName() {
return payeeName;
}
@ExcelTitleName(value = "接管人", number = 20)
public String getReceiver() {
return receiver;
}
// @ExcelTitleName(value = "结算类型", number = 51) // @ExcelTitleName(value = "结算类型", number = 51)
public String getSettlementTypeMsg() { public String getSettlementTypeMsg() {
return settlementTypeMsg; return settlementTypeMsg;
...@@ -307,72 +388,6 @@ public class CourseOrderFinanceBean { ...@@ -307,72 +388,6 @@ public class CourseOrderFinanceBean {
return productManager; return productManager;
} }
@ExcelTitleName(value = "返现", number = 13)
public BigDecimal getCashRebate() {
return cashRebate;
}
@ExcelTitleName(value = "返佣", number = 12)
public BigDecimal getCommission() {
return commission;
}
@ExcelTitleName(value = "联系人", number = 3)
public String getContactName() {
return contactName;
}
@ExcelTitleName(value = "订单名称", number = 4)
public String getOrderName() {
return orderName;
}
@ExcelTitleName(value = "城市", number = 6)
public String getDistrictName() {
return districtName;
}
@ExcelTitleName(value = "实付金额", number = 11)
public BigDecimal getActualAmount() {
return actualAmount;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "下单时间", number = 16)
public Date getOrderDate() {
return orderDate;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "支付时间", number = 17)
public Date getPayDate() {
return payDate;
}
@ExcelTitleName(value = "实际结算金额", number = 10)
public BigDecimal getActualSettleAmout() {
return actualSettleAmout;
}
@ExcelTitleName(value = "结算对象", number = 27)
public String getSettleObj() {
return settleObj;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "结算日期", number = 28)
public Date getSettleDate() {
return settleDate;
}
@ExcelTitleName(value = "财务备注", number = 29)
public String getFinComment() {
return finComment;
}
// @ExcelTitleName(value = "余额", number = 42) // @ExcelTitleName(value = "余额", number = 42)
public BigDecimal getPrePayCardAmount() { public BigDecimal getPrePayCardAmount() {
return prePayCardAmount; return prePayCardAmount;
...@@ -383,21 +398,11 @@ public class CourseOrderFinanceBean { ...@@ -383,21 +398,11 @@ public class CourseOrderFinanceBean {
return voucherAmount; return voucherAmount;
} }
@ExcelTitleName(value = "退款金额", number = 15)
public BigDecimal getRefundAmount() {
return refundAmount;
}
// @ExcelTitleName(value = "携程支付订单编号", number = 52) // @ExcelTitleName(value = "携程支付订单编号", number = 52)
public String getOutTradeId() { public String getOutTradeId() {
return outTradeId; return outTradeId;
} }
@ExcelTitleName(value = "是否线上订单", number = 18)
public Boolean getOnlineOrderFlag() {
return onlineOrderFlag;
}
// @ExcelTitleName(value = "用户类型（活跃用户，非活跃用户，新用户未下单）", number = 45) // @ExcelTitleName(value = "用户类型（活跃用户，非活跃用户，新用户未下单）", number = 45)
public String getUserType() { public String getUserType() {
return userType; return userType;
...@@ -671,6 +676,10 @@ public class CourseOrderFinanceBean { ...@@ -671,6 +676,10 @@ public class CourseOrderFinanceBean {
this.receiver = receiver; this.receiver = receiver;
} }
public void setCostAll(double costAll) {
this.costAll = costAll;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment