Commit efce88fa by caosy

卷类型

parent c2a8e656
...@@ -53,6 +53,9 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit ...@@ -53,6 +53,9 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
criteria.add(Restrictions.eq("regionCode", queryBean.getRegionCode())); criteria.add(Restrictions.eq("regionCode", queryBean.getRegionCode()));
} }
} }
if (null != queryBean.getVoucherType()) {
criteria.add(Restrictions.eq("voucherType", queryBean.getVoucherType()));
}
criteria.setFirstResult(queryBean.getPagerOffset()); criteria.setFirstResult(queryBean.getPagerOffset());
criteria.setMaxResults(queryBean.getPagerPerPage()); criteria.setMaxResults(queryBean.getPagerPerPage());
if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) { if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) {
......
...@@ -49,6 +49,9 @@ public class BuyVoucherActivity implements java.io.Serializable { ...@@ -49,6 +49,9 @@ public class BuyVoucherActivity implements java.io.Serializable {
private String wishing;//祝福语 private String wishing;//祝福语
private BigDecimal grossPrice;// 毛利价 private BigDecimal grossPrice;// 毛利价
private String regionCode; //区域 0-全区域,100-上海 ,110-广州,120-北京 private String regionCode; //区域 0-全区域,100-上海 ,110-广州,120-北京
private Integer voucherType;//卷类型 0 -正常卷 1-体验卷需要身份证
@Id @Id
@GeneratedValue(strategy = IDENTITY) @GeneratedValue(strategy = IDENTITY)
...@@ -254,4 +257,12 @@ public class BuyVoucherActivity implements java.io.Serializable { ...@@ -254,4 +257,12 @@ public class BuyVoucherActivity implements java.io.Serializable {
this.regionCode = regionCode; this.regionCode = regionCode;
} }
@Column(name = "voucherType")
public Integer getVoucherType() {
return voucherType;
}
public void setVoucherType(Integer voucherType) {
this.voucherType = voucherType;
}
} }
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