diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index d8225462c..470369fda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxMerchant; +import com.iformall.enums.EnumDelFlag; import com.iformall.service.WxBrandService; import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; @@ -66,7 +67,7 @@ public class WxBrandController extends BaseController { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); wxBrand.setTenantId(getTenantId()); - if(wxBrand.getIsDel().equals(1)){ + if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ //判断是否解绑商户 WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setTenantId(wxBrand.getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 3ffee76dc..ae385cb7c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -12,6 +12,7 @@ import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; +import com.iformall.enums.EnumDelFlag; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; @@ -67,7 +68,7 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - if(wxCoupon.getIsDel().equals(1)){ + if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ WxCouponChannel query = new WxCouponChannel(); query.setTenantId(wxCoupon.getTenantId()); query.setCouponId(wxCoupon.getId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index c3ac7367c..3701ac9f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -1,6 +1,5 @@ package com.iformall.domain.po; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java b/mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java new file mode 100644 index 000000000..22b57e20d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by luozukai + */ +public enum EnumDelFlag { + + YES(1, "是"), + NO(0, "否"), + ; + + public static EnumDelFlag getEnum(Integer code) { + for (EnumDelFlag value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumDelFlag(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index 9d0d98c48..e6e0756d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxShop; +import com.iformall.enums.EnumDelFlag; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBrandMapper; import com.iformall.service.WxBrandService; @@ -69,7 +70,7 @@ public class WxBrandServiceImpl implements WxBrandService { @Override public ResultData update(WxBrand wxBrand) { - if(wxBrand.getIsDel().equals(1)){ + if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ wxBrand.setUpdatetime(new Date()); wxBrandMapper.updateByPrimaryKeySelective(wxBrand); return new ResultData(Result.SUCCESS, "操作成功");