Browse Source

[系统发卡][修改][发送详情]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
e00520ae40
3 changed files with 13 additions and 1 deletions
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201909170500__G_COUPON_PASSWORD.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java
  3. +8
    -1
      mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201909170500__G_COUPON_PASSWORD.sql View File

@@ -0,0 +1,2 @@
alter table wx_coupon_password
add column present_id bigint(20) default 0 not null comment '发放ID';

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java View File

@@ -46,6 +46,9 @@ public class WxCouponPassword extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate") @io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate")
private Date expireDate; private Date expireDate;


@io.swagger.annotations.ApiModelProperty(value = "发放ID", name = "presentId")
private Long presentId;

@Transient @Transient
private String statusStr; private String statusStr;




+ 8
- 1
mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml View File

@@ -13,10 +13,12 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="expire_date" jdbcType="TIMESTAMP" property="expireDate" /> <result column="expire_date" jdbcType="TIMESTAMP" property="expireDate" />
<result column="present_id" jdbcType="TIMESTAMP" property="presentId"/>
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`
`id`,`tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -54,6 +56,11 @@
<if test=" null != expireDate "> <if test=" null != expireDate ">
and `expire_date` > #{expireDate} and `expire_date` > #{expireDate}
</if> </if>
<if test=" null != presentId ">
and `present_id` > #{presentId}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Loading…
Cancel
Save