diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java index e9f42c902..74c8c7c24 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxLegionActivity; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumLegionActivityStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxLegionActivityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -50,6 +51,11 @@ public class WxLegionActivityController extends BaseController { wxLegionActivity.setSortColumns(SortField.CreateDate_DESC); wxLegionActivity.setNeedCount(false); wxLegionActivity.setMerchantId(getLoginBUser().getMerchantId()); + + //已开始 + if(EnumLegionActivityStatus.ON_LINE.getCode().equals(wxLegionActivity.getStatus())){ + wxLegionActivity.setStartStatus(EnumYesOrNo.YES.getCode()); + } final PageInfo page = wxLegionActivityService.listAsPage(wxLegionActivity,pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumLegionActivityStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumLegionActivityStatus.java index a3462beed..f348a0e99 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumLegionActivityStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumLegionActivityStatus.java @@ -43,7 +43,7 @@ public enum EnumLegionActivityStatus { public static List getLine() { List line = new ArrayList(); line.add(ON_LINE.code); - line.add(OFF_LINE.code); +// line.add(OFF_LINE.code); return line; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java index 0ac56f382..3c55faf2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java @@ -64,6 +64,7 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ private void handlerQuery(WxLegionActivity record) { if (null != record.getStatus()) { + //已上架 if(EnumLegionActivityStatus.ON_LINE.getCode().equals(record.getStatus())){ record.setValidStatus(EnumYesOrNo.NO.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml index ba59eff4f..32d07207e 100644 --- a/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml @@ -48,6 +48,16 @@ and `start_time` >= #{begin} + + + and start_time <= now() + + + + + and start_time >= now() + + and `end_time` <= #{end}