diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index a6dc15c12..b98c7247f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; +import com.iformall.enums.EnumMerchantPublic; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; @@ -39,6 +40,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchantVo(); wxMerchant.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); return new ResultData(wxMerchantService.listAsPageCVo(wxMerchant, pageNum, pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 62bd5f563..247d16b01 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -140,8 +140,8 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") - private Integer show; + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "isPublic") + private Integer isPublic; public List getLevelConfigList() { return levelConfigList; @@ -380,13 +380,13 @@ public class WxMerchant implements Serializable { this.type = type; } - public Integer getShow() { - return show; - } + public Integer getIsPublic() { + return isPublic; + } - public void setShow(Integer show) { - this.show = show; - } + public void setIsPublic(Integer isPublic) { + this.isPublic = isPublic; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 8d0b46554..d0f0ca2af 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -51,14 +51,14 @@ public class WxMerchantVo { private String floorName; @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") - private String show; + private Integer isPublic; - public String getShow() { - return show; + public Integer getIsPublic() { + return isPublic; } - public void setShow(String show) { - this.show = show; + public void setIsPublic(Integer isPublic) { + this.isPublic = isPublic; } public String getBuildingName() {return buildingName; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java new file mode 100644 index 000000000..9acd6ba31 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantPublic.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMerchantPublic { + + PUBLIC(1, "公开"), + PRIVATE(0, "私有"),; + + public static EnumMerchantPublic getEnum(Integer code) { + for (EnumMerchantPublic value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMerchantPublic(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/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0faac31b4..6d4423835 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -17,13 +17,13 @@ - + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`shop_type`,`brand`,`type`,`show` + `business_id`,`shop_type`,`brand`,`type`,`public` @@ -77,8 +77,8 @@ and `type` = #{type} - - and `show` = #{show} + + and `public` = #{public} and id in @@ -100,7 +100,7 @@ m.id, m.img_url,m.name,m.link_phone,m.status,m.business_id, s.addr,s.shop_number,s.baidu_poi, - mb.building_name,mf.floor_name,m.show + mb.building_name,mf.floor_name,m.is_public @@ -115,7 +115,7 @@ - + @@ -177,6 +177,11 @@ and mf.`floor_name` like concat('%', #{floorName},'%') + + + and m.`is_public` = #{isPublic} + +