Skip to content

caosy / fun-common

Go to a project
Commit 84373643 by Huang Linyu
Options

未使用抵用券列表导出

parent 5c10e9b5
Inline Side-by-side
Showing with 135 additions and 2 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 {
......@@ -57,7 +58,8 @@ public class VoucherItemDTO implements Serializable {
subTitle = "";
}
}
public String getNo() {
return no;
}
......@@ -65,7 +67,6 @@ public class VoucherItemDTO implements Serializable {
public void setNo(String no) {
this.no = no;
}
public int getType() {
return type;
}
......@@ -74,6 +75,7 @@ public class VoucherItemDTO implements Serializable {
this.type = type;
}
@ExcelTitleName(value = "金额", number = 3)
public BigDecimal getAmount() {
return amount;
}
......@@ -82,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;
}
......@@ -90,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;
}
......@@ -101,6 +109,7 @@ public class VoucherItemDTO implements Serializable {
/*
* 0--未使用 1--已使用
*/
// @ExcelTitleName(value = "是否使用", number = 2)
public int getUsed() {
return used;
}
......@@ -112,6 +121,7 @@ public class VoucherItemDTO implements Serializable {
/*
* 0--未过期 1--过期
*/
// @ExcelTitleName(value = "是否过期", number = 2)
public int getOverdue() {
return overdue;
}
......@@ -120,6 +130,7 @@ public class VoucherItemDTO implements Serializable {
this.overdue = overdue;
}
@ExcelTitleName(value = "ID", number = 1)
public int getId() {
return id;
}
......@@ -128,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;
}
......@@ -136,6 +150,7 @@ public class VoucherItemDTO implements Serializable {
this.useDate = useDate;
}
@ExcelTitleName(value = "使用订单编号", number = 8)
public Long getOrderNo() {
return orderNo;
}
......@@ -144,6 +159,7 @@ public class VoucherItemDTO implements Serializable {
this.orderNo = orderNo;
}
@ExcelTitleName(value = "抵用券规则id", number = 10)
public Integer getRuleId() {
return ruleId;
}
......@@ -152,6 +168,7 @@ public class VoucherItemDTO implements Serializable {
this.ruleId = ruleId;
}
@ExcelTitleName(value = "规则描述", number = 12)
public String getDescription() {
return description;
}
......@@ -160,6 +177,7 @@ public class VoucherItemDTO implements Serializable {
this.description = description;
}
@ExcelTitleName(value = "备注", number = 11)
public String getRemark() {
return remark;
}
......@@ -168,6 +186,7 @@ public class VoucherItemDTO implements Serializable {
this.remark = remark;
}
@ExcelTitleName(value = "是否使用", number = 6)
public String getUsedString() {
return usedString;
}
......@@ -176,6 +195,7 @@ public class VoucherItemDTO implements Serializable {
this.usedString = usedString;
}
@ExcelTitleName(value = "现金券类型", number = 2)
public String getTypeString() {
return typeString;
}
......@@ -214,6 +234,7 @@ public class VoucherItemDTO implements Serializable {
this.sendToUserType = sendToUserType;
}
@ExcelTitleName(value = "uid", number = 9)
public String getUid() {
return uid;
}
......
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/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
......@@ -16,6 +19,14 @@ public enum VourcherStatusEnum {
this.value = value;
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