Browse Source

fix 业态自定义

release_toaliyun_real
lin 3 years ago
parent
commit
704bc32d02
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -189,7 +189,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
WxBusiness bussiness = null;
if (null != merchant.getBusinessId()) {
bussiness = wxBusinessMapper.selectById(merchant.getBusinessId());
bussiness = wxBusinessMapper.selectById(merchant.getFinalTenantId(),merchant.getBusinessId());
}
List<WxShopVo> shopVoList = wxShopService.findMerchantShopVoList(merchant,merchant.getId());
return merchantToVo(merchant,bussiness,shopVoList);
@@ -1842,7 +1842,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
Integer businessId = (Integer)merchantMap.get("business_id");
if (null != businessId) {
WxBusiness business = wxBusinessMapper.selectById(brandId);
WxBusiness business = wxBusinessMapper.selectById(shop.getFinalTenantId(),businessId);
if (null != business) {
merchantMap.put("businessTitle", business.getTitle());
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -2029,7 +2029,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxMerchant merchant = wxMerchantService.getById(wxRentContract.getMerchantId());
//经营业态
wxRentContract.getMerchantId();
WxBusiness wxBusiness = wxBusinessMapper.selectById(merchant.getBusinessId());
WxBusiness wxBusiness = wxBusinessMapper.selectById(merchant.getFinalTenantId(),merchant.getBusinessId());
result.put("business", wxBusiness.getTitle());

if (merchant != null) {


Loading…
Cancel
Save