Skip to content

caosy / fun-common

Go to a project
Commit 2693500b by Huang Linyu
Options

Merge branch 'f-6.6.5' into release 

# Conflicts:
#	fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherItemDTO.java
parents c80b5cba 84373643
Inline Side-by-side
Showing with 187 additions and 46 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherItemDTO.java
......@@ -6,6 +6,7 @@ import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import com.ctrip.fun.mall.vo.ExcelTitleName;
import com.fasterxml.jackson.annotation.JsonFormat;
public class VoucherItemDTO implements Serializable {
......@@ -32,6 +33,7 @@ public class VoucherItemDTO implements Serializable {
private int sendToUserType;
private String description;
private String remark;
private String uid;
private String typeString; // 对应type的名称
......@@ -57,6 +59,7 @@ public class VoucherItemDTO implements Serializable {
}
}
public String getNo() {
return no;
}
......@@ -64,7 +67,6 @@ public class VoucherItemDTO implements Serializable {
public void setNo(String no) {
this.no = no;
}
public int getType() {
return type;
}
......@@ -73,6 +75,7 @@ public class VoucherItemDTO implements Serializable {
this.type = type;
}
@ExcelTitleName(value = "金额", number = 3)
public BigDecimal getAmount() {
return amount;
}
......@@ -81,6 +84,9 @@ public class VoucherItemDTO implements Serializable {
this.amount = amount;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "有效期start", number = 4)
public Date getStartUseDate() {
return startUseDate;
}
......@@ -89,6 +95,9 @@ public class VoucherItemDTO implements Serializable {
this.startUseDate = startUseDate;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "有效期end", number = 5)
public Date getEndUseDate() {
return endUseDate;
}
......@@ -100,6 +109,7 @@ public class VoucherItemDTO implements Serializable {
/*
* 0--未使用 1--已使用
*/
// @ExcelTitleName(value = "是否使用", number = 2)
public int getUsed() {
return used;
}
......@@ -111,6 +121,7 @@ public class VoucherItemDTO implements Serializable {
/*
* 0--未过期 1--过期
*/
// @ExcelTitleName(value = "是否过期", number = 2)
public int getOverdue() {
return overdue;
}
......@@ -119,6 +130,7 @@ public class VoucherItemDTO implements Serializable {
this.overdue = overdue;
}
@ExcelTitleName(value = "ID", number = 1)
public int getId() {
return id;
}
......@@ -127,6 +139,9 @@ public class VoucherItemDTO implements Serializable {
this.id = id;
}
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExcelTitleName(value = "使用日期", number = 7)
public Date getUseDate() {
return useDate;
}
......@@ -135,6 +150,7 @@ public class VoucherItemDTO implements Serializable {
this.useDate = useDate;
}
@ExcelTitleName(value = "使用订单编号", number = 8)
public Long getOrderNo() {
return orderNo;
}
......@@ -143,6 +159,7 @@ public class VoucherItemDTO implements Serializable {
this.orderNo = orderNo;
}
@ExcelTitleName(value = "抵用券规则id", number = 10)
public Integer getRuleId() {
return ruleId;
}
......@@ -151,6 +168,7 @@ public class VoucherItemDTO implements Serializable {
this.ruleId = ruleId;
}
@ExcelTitleName(value = "规则描述", number = 12)
public String getDescription() {
return description;
}
......@@ -159,6 +177,7 @@ public class VoucherItemDTO implements Serializable {
this.description = description;
}
@ExcelTitleName(value = "备注", number = 11)
public String getRemark() {
return remark;
}
......@@ -167,6 +186,7 @@ public class VoucherItemDTO implements Serializable {
this.remark = remark;
}
@ExcelTitleName(value = "是否使用", number = 6)
public String getUsedString() {
return usedString;
}
......@@ -175,6 +195,7 @@ public class VoucherItemDTO implements Serializable {
this.usedString = usedString;
}
@ExcelTitleName(value = "现金券类型", number = 2)
public String getTypeString() {
return typeString;
}
......@@ -213,6 +234,14 @@ public class VoucherItemDTO implements Serializable {
this.sendToUserType = sendToUserType;
}
@ExcelTitleName(value = "uid", number = 9)
public String getUid() {
return uid;
}
public void setUid(String uid) {
this.uid = uid;
}
public int getMultiple() {
return multiple;
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherQueryFormDTO.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.common.vo.basic;
import java.math.BigDecimal;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import com.ctrip.fun.common.vo.AbstractPagedQuery;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
*
* @author lyhuang
*
*/
public class VoucherQueryFormDTO extends AbstractPagedQuery{
/**
*
*/
private static final long serialVersionUID = -4961085816927876390L;
private String uid;
/** 描述 */
private String description;
private Date endUseDateStart;
private Date endUseDateEnd;
private Integer used;
private Boolean exported;
public String getUid() {
return uid;
}
public String getDescription() {
return description;
}
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getEndUseDateStart() {
return endUseDateStart;
}
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getEndUseDateEnd() {
return endUseDateEnd;
}
public void setUid(String uid) {
this.uid = uid;
}
public void setDescription(String description) {
this.description = description;
}
public void setEndUseDateStart(Date endUseDateStart) {
this.endUseDateStart = endUseDateStart;
}
public void setEndUseDateEnd(Date endUseDateEnd) {
this.endUseDateEnd = endUseDateEnd;
}
public Integer getUsed() {
return used;
}
public void setUsed(Integer used) {
this.used = used;
}
public Boolean getExported() {
return exported;
}
public void setExported(Boolean exported) {
this.exported = exported;
}
/*
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getStartUseDate() {
return startUseDate;
}
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Date getEndUseDate() {
return endUseDate;
}*/
}
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;
}
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VourcherStatusEnum.java
......@@ -3,6 +3,9 @@
*/
package com.ctrip.fun.common.vo.order;
import java.util.HashMap;
import java.util.Map;
/**
* @author zgsong
* @version 1.0.0
......@@ -17,6 +20,14 @@ public enum VourcherStatusEnum {
this.name = name;
}
private static Map<Integer, VourcherStatusEnum> map = new HashMap<Integer, VourcherStatusEnum>();
static {
for (VourcherStatusEnum it : VourcherStatusEnum.values()) {
map.put(it.value, it);
}
}
public int getValue() {
return value;
}
......@@ -33,4 +44,7 @@ public enum VourcherStatusEnum {
this.name = name;
}
public static VourcherStatusEnum valueOf(int value) {
return map.get(value);
}
}
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