Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
2afd632b53
1 changed files with 20 additions and 0 deletions
  1. +20
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java

+ 20
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java View File

@@ -310,6 +310,7 @@ public class WxShopServiceImpl implements WxShopService {
Long shopId = (Long)shop.get("id");
if (null != shopId) {
Long merchantId = shopMerchantIdMap.get(shopId);
boolean isSetRentName = false;
if (null != merchantId && null != merchantMap) {
WxMerchant m = merchantMap.get(merchantId);
if (null != m) {
@@ -317,6 +318,25 @@ public class WxShopServiceImpl implements WxShopService {
shop.put("merchantId", m.getId());
shop.put("linkPerson", m.getLinkPerson());
shop.put("linkPhone", m.getLinkPhone());
//如果不是虚拟商户,则取商户的名称
if (m.getIsPrivate() == EnumYesOrNo.NO.getCode()) {
shop.put("rentName",m.getName());
shop.put("rentType", 3);
isSetRentName = true;
}
}
}
if (!isSetRentName) {
//查询租户和业主
WxShopUsers suq = new WxShopUsers();
suq.updateTenantInfo(record);
suq.setShopId(shopId);
suq.setStatus(EnumShopUsersStatus.LIVE.getCode());
suq.setSortColumns("type desc");
WxShopUsers wsu = this.getOneShopUsers(suq);
if (null != wsu) {
shop.put("rentName",wsu.getName());
shop.put("rentType", wsu.getType());
}
}
}


Loading…
Cancel
Save