diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java index 040d43ca8..3487de078 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCampaignStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; @@ -67,7 +68,7 @@ public class WxCampaignController extends BaseController { } else { wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } - wxCampaign.setStatus(0); + wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setTenantId(getTenantId()); // wxCampaign.setSortNum(sortNum+1); wxCampaignService.saveOrUpdate(wxCampaign); @@ -105,7 +106,7 @@ public class WxCampaignController extends BaseController { wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); - wxCouponChannel.setStatus(0); + wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); List couponList = wxCouponChannelService.listAPI(wxCouponChannel); wxCampaign.setCoupons(couponList); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 5de07dd75..b8b66ae58 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCampaignStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; @@ -47,7 +48,7 @@ public class WxCampaignController extends BaseController { public ResultData list(@ModelAttribute WxCampaign wxCampaign, Integer pageNum, Integer pageSize) { if (null == wxCampaign) wxCampaign = new WxCampaign(); - wxCampaign.setStatus(0); + wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setTenantId(getTenantId()); wxCampaign.setSortColumns(SortNum_ASC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignStatus.java new file mode 100644 index 000000000..37476277e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignStatus.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCampaignStatus { + + // 0-已上架;1-已下架; + + STATUS_THROW_IN(0, "已上架"), + STATUS_TAKE_OFFF(1, "已下架"), + ; + + public static EnumCampaignStatus getEnum(Integer code) { + for (EnumCampaignStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCampaignStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +}