ソースを参照

[C端][更改]:更新couponCVo的结构

release_toaliyun_real
hupeng 7年前
コミット
6b467a77fd
2個のファイルの変更41行の追加36行の削除
  1. +31
    -30
      mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java
  2. +10
    -6
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 31
- 30
mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java ファイルの表示

@@ -12,6 +12,7 @@ import java.util.List;
public class WxCouponCVo implements Serializable {
private static final long serialVersionUID = 1L;

/*投放券频道id**/
@Id
protected Long id;

@@ -50,9 +51,20 @@ public class WxCouponCVo implements Serializable {
@Transient
private String priceStr;

/*频道id**/
@io.swagger.annotations.ApiModelProperty(value="频道id",name="couponChannelId")
private Long couponChannelId;


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


/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@@ -132,14 +144,6 @@ public class WxCouponCVo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="业态",name="business")
private String business;

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


/*发券商户信息*/
/*商户图片**/
@@ -173,12 +177,23 @@ public class WxCouponCVo implements Serializable {
private String floorName;


public Long getCouponChannelId() {
return couponChannelId;
public Date getBeginTime() {
return beginTime;
}

public void setCouponChannelId(Long couponChannelId) {
this.couponChannelId = couponChannelId;
public void setBeginTime(Date _beginTime) {
beginTime = _beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date _endTime) {
endTime = _endTime;
}
public Long getCouponId() {
return couponId;
}
public void setCouponId(Long _couponId) {
couponId = _couponId;
}

public String getTenantId() {
@@ -374,20 +389,6 @@ 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 void setBuildingName(String _building) {
buildingName = _building;


+ 10
- 6
mallinkService/src/main/resources/mapper/WxCouponMapper.xml ファイルの表示

@@ -465,7 +465,11 @@

<resultMap id="CUserResultMap" type="com.simple.domain.vo.WxCouponCVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="coupon_channel_id" jdbcType="VARCHAR" property="couponChannelId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />


<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="type" jdbcType="INTEGER" property="type" />
@@ -491,9 +495,6 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<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="name" jdbcType="VARCHAR" property="merchantName" />
<result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone" />
@@ -508,11 +509,11 @@
</resultMap>

<sql id="allCUserColumns">
c.id,cc.id as counpon_channel_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.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,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name,
cc.begin_time,cc.end_time
cc.id,cc.coupon_id,cc.begin_time,cc.end_time
</sql>


@@ -526,6 +527,9 @@
left join wx_mall_floor mf on s.floor = mf.id
where c.merchant_id = m.id
and cc.coupon_id = c.id
<if test=" null != id ">
and cc.id = #{id}
</if>
<if test=" null != couponId ">
and c.id = #{couponId}
</if>


読み込み中…
キャンセル
保存