Skip to content

caosy / fun-common

Go to a project
Commit 5c10e9b5 by Huang Linyu
Options

财务-球场订单对账-导出排序优化

parent 0dbf9bc9
Inline Side-by-side
Showing with 45 additions and 45 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceBean.java
......@@ -168,237 +168,237 @@ public class CourseOrderFinanceBean {
@ExcelTitleName(value = "球场ID", number = 5)
@ExcelTitleName(value = "球场ID", number = 1)
public Integer getCourseId() {
return courseId;
}
@ExcelTitleName(value = "球场名称", number = 6)
@ExcelTitleName(value = "球场名称", number = 5)
public String getCourseName() {
return courseName;
}
@ExcelTitleName(value = "供应商ID", number = 14)
@ExcelTitleName(value = "供应商ID", number = 30)
public String getSupplierId() {
return supplierId;
}
@ExcelTitleName(value = "供应商", number = 15)
@ExcelTitleName(value = "供应商", number = 31)
public String getSupplierName() {
return supplierName;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "打球日期", number = 20)
@ExcelTitleName(value = "打球日期", number = 7)
public Date getPlayDate() {
return playDate;
}
@ExcelTitleName(value = "TEETIME", number = 25)
// @ExcelTitleName(value = "TEETIME", number = 46)
public String getTeeTime() {
return teeTime;
}
@ExcelTitleName(value = "订单号", number = 30)
@ExcelTitleName(value = "订单号", number = 2)
public Long getOrderNo() {
return orderNo;
}
@ExcelTitleName(value = "单人成本/底价", number = 45)
@ExcelTitleName(value = "单人成本/底价", number = 9)
public double getCostForPerson() {
return costForPerson;
}
@ExcelTitleName(value = "订单总成本", number = 50)
// @ExcelTitleName(value = "订单总成本", number = 48)
public double getCostForOrder() {
return costForOrder;
}
@ExcelTitleName(value = "打球人名字", number = 40)
// @ExcelTitleName(value = "打球人名字", number = 47)
public String getPlayNames() {
return playNames;
}
@ExcelTitleName(value = "订单状态", number = 55)
@ExcelTitleName(value = "订单状态", number = 19)
public String getOrderStatus() {
return orderStatus;
}
@ExcelTitleName(value = "支付方式", number = 56)
@ExcelTitleName(value = "支付方式", number = 8)
public String getPayMode() {
return payMode;
}
@ExcelTitleName(value = "打球人数", number = 35)
@ExcelTitleName(value = "打球人数", number = 22)
public int getPlayNums() {
return playNums;
}
@ExcelTitleName(value = "打球人1", number = 12)
@ExcelTitleName(value = "打球人1", number = 23)
public String getPlayer1() {
return player1;
}
@ExcelTitleName(value = "打球人2", number = 12)
@ExcelTitleName(value = "打球人2", number = 24)
public String getPlayer2() {
return player2;
}
@ExcelTitleName(value = "打球人3", number = 12)
@ExcelTitleName(value = "打球人3", number = 25)
public String getPlayer3() {
return player3;
}
@ExcelTitleName(value = "打球人4", number = 12)
@ExcelTitleName(value = "打球人4", number = 26)
public String getPlayer4() {
return player4;
}
@ExcelTitleName(value = "保险金额", number = 12)
@ExcelTitleName(value = "保险金额", number = 14)
public Double getInsuranceAmount() {
return insuranceAmount;
}
@ExcelTitleName(value = "后台下单渠道1", number = 12)
// @ExcelTitleName(value = "后台下单渠道1", number = 40)
public String getChannel1() {
return channel1;
}
@ExcelTitleName(value = "后台下单渠道2", number = 12)
// @ExcelTitleName(value = "后台下单渠道2", number = 41)
public String getChannel2() {
return channel2;
}
@ExcelTitleName(value = "收款人", number = 20)
@ExcelTitleName(value = "收款人", number = 21)
public String getPayeeName() {
return payeeName;
}
@ExcelTitleName(value = "接管人", number = 40)
@ExcelTitleName(value = "接管人", number = 20)
public String getReceiver() {
return receiver;
}
@ExcelTitleName(value = "结算类型", number = 60)
// @ExcelTitleName(value = "结算类型", number = 51)
public String getSettlementTypeMsg() {
return settlementTypeMsg;
}
@ExcelTitleName(value = "订单售价", number = 52)
// @ExcelTitleName(value = "订单售价", number = 50)
public double getAmount() {
return amount;
}
@ExcelTitleName(value = "单人售价", number = 51)
// @ExcelTitleName(value = "单人售价", number = 49)
public double getSalePrice() {
return salePrice;
}
@ExcelTitleName(value = "手动扣款类型", number = 65)
// @ExcelTitleName(value = "手动扣款类型", number = 53)
public String getOfflinePayTypeMsg() {
return offlinePayTypeMsg;
}
@ExcelTitleName(value = "产品经理", number = 18)
// @ExcelTitleName(value = "产品经理", number = 44)
public String getProductManager() {
return productManager;
}
@ExcelTitleName(value = "返现", number = 53)
@ExcelTitleName(value = "返现", number = 13)
public BigDecimal getCashRebate() {
return cashRebate;
}
@ExcelTitleName(value = "返佣", number = 54)
@ExcelTitleName(value = "返佣", number = 12)
public BigDecimal getCommission() {
return commission;
}
@ExcelTitleName(value = "联系人", number = 20)
@ExcelTitleName(value = "联系人", number = 3)
public String getContactName() {
return contactName;
}
@ExcelTitleName(value = "订单名称", number = 100)
@ExcelTitleName(value = "订单名称", number = 4)
public String getOrderName() {
return orderName;
}
@ExcelTitleName(value = "城市", number = 12)
@ExcelTitleName(value = "城市", number = 6)
public String getDistrictName() {
return districtName;
}
@ExcelTitleName(value = "实付金额", number = 12)
@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 = 20)
@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 = 20)
@ExcelTitleName(value = "支付时间", number = 17)
public Date getPayDate() {
return payDate;
}
@ExcelTitleName(value = "实际结算金额", number = 12)
@ExcelTitleName(value = "实际结算金额", number = 10)
public BigDecimal getActualSettleAmout() {
return actualSettleAmout;
}
@ExcelTitleName(value = "结算对象", number = 128)
@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 = 20)
@ExcelTitleName(value = "结算日期", number = 28)
public Date getSettleDate() {
return settleDate;
}
@ExcelTitleName(value = "财务备注", number = 256)
@ExcelTitleName(value = "财务备注", number = 29)
public String getFinComment() {
return finComment;
}
@ExcelTitleName(value = "余额", number = 12)
// @ExcelTitleName(value = "余额", number = 42)
public BigDecimal getPrePayCardAmount() {
return prePayCardAmount;
}
@ExcelTitleName(value = "兑换卷", number = 12)
// @ExcelTitleName(value = "兑换卷", number = 43)
public BigDecimal getVoucherAmount() {
return voucherAmount;
}
@ExcelTitleName(value = "退款金额", number = 12)
@ExcelTitleName(value = "退款金额", number = 15)
public BigDecimal getRefundAmount() {
return refundAmount;
}
@ExcelTitleName(value = "携程支付订单编号", number = 64)
// @ExcelTitleName(value = "携程支付订单编号", number = 52)
public String getOutTradeId() {
return outTradeId;
}
@ExcelTitleName(value = "是否线上订单", number = 12)
@ExcelTitleName(value = "是否线上订单", number = 18)
public Boolean getOnlineOrderFlag() {
return onlineOrderFlag;
}
@ExcelTitleName(value = "用户类型（活跃用户，非活跃用户，新用户未下单）", number = 20)
// @ExcelTitleName(value = "用户类型（活跃用户，非活跃用户，新用户未下单）", number = 45)
public String getUserType() {
return userType;
}
......
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