diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index ea3888e8c..a1cdd7813 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -23,6 +23,8 @@ import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumMerchantAdmin; import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumRentShopType; +import com.iformall.enums.EnumShopSellStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.*; import io.swagger.annotations.ApiImplicitParam; @@ -35,6 +37,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.util.ArrayList; import java.util.List; /** @@ -267,6 +271,14 @@ public class WxMerchantController extends BaseController { if (null == wxMerchant.getIsPrivate()) { wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); } + //如果是已售,则查询虚拟商户,并且店铺类型是商业的 + if (wxMerchant.getIsPrivate()==EnumShopSellStatus.SELLED.getCode()) { + wxMerchant.setIsPrivate(EnumYesOrNo.YES.getCode()); + List rentShopTypeList = new ArrayList(); + rentShopTypeList.add(EnumRentShopType.SHOP.getCode()); + rentShopTypeList.add(EnumRentShopType.POINT.getCode()); + wxMerchant.setPrivateRentShopTypeList(rentShopTypeList); + } return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); } 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 216492eea..b1dade1bd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -502,4 +502,6 @@ public class WxMerchant extends TenantEntity { public Date receiveDate; @TableField(exist = false) public Integer isAll; + @TableField(exist = false) + private List privateRentShopTypeList; } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 7bab28eca..780733edd 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -190,6 +190,13 @@ and (m.`name` like concat('%', #{searchKey},'%') or m.`link_phone` like concat('%', #{searchKey},'%')) + + + and m.`create_shop_type` in + + #{prstItem} + + and m.`is_admin` in