Просмотр исходного кода

fix 业态自定义

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
704bc32d02
2 измененных файлов: 3 добавлений и 3 удалений
  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 Просмотреть файл

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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

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


if (merchant != null) { if (merchant != null) {


Загрузка…
Отмена
Сохранить