diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java index af2f59edd..46b17e5a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java @@ -1,9 +1,12 @@ package com.iformall.domain.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + @Data @EqualsAndHashCode(callSuper = true) public class WxMerchantDto extends TenantEntity { @@ -40,6 +43,10 @@ public class WxMerchantDto extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否显示在广场", name = "isPrivate") private Integer isPrivate; + @io.swagger.annotations.ApiModelProperty(value="EnumMerchantAdmin",name="isAdmin") + private Integer isAdmin; + private List adminTypes; + @io.swagger.annotations.ApiModelProperty(value = "品牌名称", name = "brandName") private String brandName; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index df4bc992c..7a0620b9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -206,6 +206,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { List merchantIds = getFloorBuildMerchantIds(wxMerchantDto, null, wxMerchantDto.getBuilding(), wxMerchantDto.getFloor(), null, null); wxMerchantDto.setIds(merchantIds); } + if(wxMerchantDto.getIsAdmin() == null){ + wxMerchantDto.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); + } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findListCVo(wxMerchantDto)); PageInfo retPageInfo = new PageInfo(); retPageInfo.setPageNum(pageInfo.getPageNum()); @@ -291,7 +294,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public List findIdList(WxMerchant record) { - if(record == null){ + if(record.getIsAdmin() == null){ record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); } return wxMerchantMapper.findIdList(record); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 41af5b544..33731b5a6 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -284,10 +284,20 @@ and m.`is_private` = #{isPrivate} + + and m.`is_admin` = #{isAdmin} + and m.`id` = #{id} + + + and m.`is_admin` in + + #{typeItem} + + and m.id in