diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java index 3157c54b3..36261a2ab 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -5,6 +5,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.enums.EnumActivityStatus; import com.iformall.service.WxActivityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -42,9 +43,7 @@ public class WxActivityController extends BaseController { public ResultData list(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxActivityController::list"); if (null == wxActivity) wxActivity = new WxActivity(); - if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) { - wxActivity.setStatus(null); - } + wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode()); wxActivity.updateTenantInfo(getTenantInfo()); wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index af6e248f2..ba3457944 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -66,9 +66,13 @@ and `type` = #{type} - + and `status` = #{status} + + + and `status` >= 2 and `status` <= 3 + and `create_time` = #{createTime} @@ -85,7 +89,7 @@ and `is_expired` = #{isExpired} - + and `create_time` between #{starttime} and #{endtime}