Просмотр исходного кода

[C端][修改]:增加券类详情的发送时间

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
a7a1245aa1
3 измененных файлов: 27 добавлений и 23 удалений
  1. +22
    -0
      mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java
  2. +0
    -22
      mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelVo.java
  3. +5
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 22
- 0
mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java Просмотреть файл

@@ -129,6 +129,14 @@ public class WxCouponCVo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="业态",name="business") @io.swagger.annotations.ApiModelProperty(value="业态",name="business")
private String business; private String business;


/*发放相关参数*/
/*开始时间**/
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime")
private Date beginTime;
/*结束时间**/
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime")
private Date endTime;



/*发券商户信息*/ /*发券商户信息*/
/*商户图片**/ /*商户图片**/
@@ -356,6 +364,20 @@ public class WxCouponCVo implements Serializable {
} }




public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date _beginTime) {
beginTime = _beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date _endTime) {
endTime = _endTime;
}


public String getBuildingName() {return buildingName; } public String getBuildingName() {return buildingName; }
public void setBuildingName(String _building) { public void setBuildingName(String _building) {
buildingName = _building; buildingName = _building;


+ 0
- 22
mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelVo.java Просмотреть файл

@@ -60,12 +60,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
/*1.主动领取2.定向投放**/ /*1.主动领取2.定向投放**/
@io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType")
private Integer sendType; private Integer sendType;
/*发放开始时间**/
@io.swagger.annotations.ApiModelProperty(value="发放开始时间",name="sendStartDate")
private Date sendStartDate;
/*发放结束时间**/
@io.swagger.annotations.ApiModelProperty(value="发放结束时间",name="sendEndDate")
private Date sendEndDate;


public Integer getRemainInventory() { public Integer getRemainInventory() {
return remainInventory; return remainInventory;
@@ -131,22 +125,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
this.sendType = sendType; this.sendType = sendType;
} }


public Date getSendStartDate() {
return sendStartDate;
}

public void setSendStartDate(Date sendStartDate) {
this.sendStartDate = sendStartDate;
}

public Date getSendEndDate() {
return sendEndDate;
}

public void setSendEndDate(Date sendEndDate) {
this.sendEndDate = sendEndDate;
}

public String getSalePriceStr() { public String getSalePriceStr() {
if(salePrice!=null) { if(salePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00"); DecimalFormat df=new DecimalFormat("0.00");


+ 5
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -490,6 +490,9 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="business" jdbcType="VARCHAR" property="business" /> <result column="business" jdbcType="VARCHAR" property="business" />


<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />

<result column="img_url" jdbcType="VARCHAR" property="merchantImgUrl" /> <result column="img_url" jdbcType="VARCHAR" property="merchantImgUrl" />
<result column="name" jdbcType="VARCHAR" property="merchantName" /> <result column="name" jdbcType="VARCHAR" property="merchantName" />
<result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone" /> <result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone" />
@@ -507,7 +510,8 @@
c.id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, c.id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business,
m.img_url,m.name,m.link_phone,m.status, m.img_url,m.name,m.link_phone,m.status,
s.addr,s.shop_number,s.baidu_poi, s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name
mb.building_name,mf.floor_name,
cc.begin_time,cc.end_time
</sql> </sql>






Загрузка…
Отмена
Сохранить