diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java index e1c05d925..da01b2ae4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -63,9 +63,9 @@ public class WxActivityController extends BaseController { wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode()); wxActivity.updateTenantInfo(getTenantInfo()); wxActivity.setSortColumns(BaseEntity.SortField.ActivityStartTime_DESC,BaseEntity.SortField.Id_DESC); - if(wxActivity.getStarttime() == null || wxActivity.getEndtime() == null){ - wxActivity.setStarttime(DateUtils.getFirstDayForCurrMonth()); - wxActivity.setEndtime(DateUtils.getLastDayForMonth(new Date())); + if(wxActivity.getStartDate() == null || wxActivity.getEndDate() == null){ + wxActivity.setStartDate(DateUtils.getFirstDayForCurrMonth()); + wxActivity.setEndDate(DateUtils.getLastDayForMonth(new Date())); } return wxActivityService.getListStatus(wxActivity); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 872a6ed78..3fb0ab51a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -72,11 +72,11 @@ public class WxActivity extends TenantEntity { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") - private Date starttime; + private Date startDate; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") - private Date endtime; + private Date endDate; @TableField(exist = false) diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 98df65c0b..2a76f52a5 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -89,12 +89,12 @@ and `is_expired` = #{isExpired} - - and `create_time` between #{starttime} and #{endtime} - + + + - - and `activity_start_time` >= #{starttime} and `activity_end_time` <= #{starttime} + + and `activity_start_time` >= #{startDate} and `activity_end_time` < #{endDate}