From 2144080ed1a3923f6643cceef01e296c144f2850 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 9 Apr 2019 14:22:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A5=E5=BD=95=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxMerchant.java | 11 +++++++++++ .../service/impl/WxMerchantServiceImpl.java | 16 ++++++++++++++++ .../main/resources/mapper/WxMerchantMapper.xml | 6 ++++++ 3 files changed, 33 insertions(+) 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 e3d318cb7..805bf740b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -97,6 +97,9 @@ public class WxMerchant implements Serializable { @Transient private List levelConfigList; + @Transient + private Integer rentShopType; + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -399,6 +402,14 @@ public class WxMerchant implements Serializable { this.isPublic = isPublic; } + public Integer getRentShopType() { + return rentShopType; + } + + public void setRentShopType(Integer rentShopType) { + this.rentShopType = rentShopType; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 5ff020ac0..ef450c453 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -98,6 +98,22 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); } + if (record.getRentShopType() != null) { + WxMerchantShop wxMerchantShop = new WxMerchantShop(); + wxMerchantShop.setMerchantId(merchant.getId()); + wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + List> shops = new ArrayList<>(); + List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); + for (WxMerchantShop merchantShop : wxMerchantShopList) { + WxShop shop = new WxShop(); + record.setId(merchantShop.getShopId()); + List> shoplist = wxShopMapper.findListMap(shop); + if (shoplist.size() > 0) { + shops.add(shoplist.get(0)); + } + } + merchant.setShoplist(shops); + } } PageInfo pageInfo = new PageInfo<>(merchants); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index f149ad453..99170d966 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -84,6 +84,12 @@ and `email` = #{email} + + and id in( + select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is + not null and status not in(1,2,3,4) + ) + and id in