diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index b0070fa73..fb5c2da81 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -67,7 +67,11 @@ public class WxCardSpend implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @Transient + private Date startdate; + @Transient + private Date enddate; public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 8ac258612..2d7068bd3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -74,4 +74,10 @@ public class WxCardVo extends WxCardInfo { @Transient protected String statusStr; + + @Transient + private Date startdate; + + @Transient + private Date enddate; } diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 7004b116c..9b78c56a0 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -57,7 +57,10 @@ and `update_date` = #{updateDate} - + + + and `create_date` between #{startdate} and #{enddate} + and id in @@ -158,6 +161,9 @@ and o_phone = #{oPhone} + + and ci.`create_date` between #{startdate} and #{enddate} + and status in diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index e26a360a5..f6c6bd8be 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -70,7 +70,10 @@ and `update_date` = #{updateDate} - + + + and `create_date` between #{startdate} and #{enddate} + and id in @@ -166,6 +169,9 @@ and cs.`update_date` = #{updateDate} + + and cs.`create_date` between #{startdate} and #{enddate} + and cs.id in