Browse Source

合同续签

release_toaliyun_real
furunxin 5 years ago
parent
commit
3e60b0ffab
1 changed files with 28 additions and 28 deletions
  1. +28
    -28
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

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

@@ -730,34 +730,34 @@ public class WxMerchantServiceImpl implements WxMerchantService {
public PageInfo<WxMerchant> listVoAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) {
PageHelper.startPage(pageIndex, pageSize);
List<WxMerchant> merchants = wxMerchantMapper.findListVo(record);
// for (WxMerchant merchant : merchants) {
// if (record.getRentShopType() != null) {
// List<Map<String, Object>> shops = new ArrayList<>();
// WxMerchantShop wxMerchantShop = new WxMerchantShop();
// wxMerchantShop.setMerchantId(merchant.getId());
// wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
// List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop);
// for (WxMerchantShop merchantShop : wxMerchantShopList) {
// WxShop shop = new WxShop();
// shop.setId(merchantShop.getShopId());
// List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop);
// if (shoplist.size() > 0) {
// shops.add(shoplist.get(0));
// }
// }
// merchant.setShoplist(shops);
// }
//
// WxRentContract rc = new WxRentContract();
// rc.setMerchantId(merchant.getId());
// rc.setTenantId(merchant.getTenantId());
// List<WxRentContract> rentContractList = wxRentContractMapper.findList(rc);
// if(CollectionUtils.isEmpty(rentContractList)){
// merchant.setHasContract(EnumHasContract.NO.getCode());
// }else{
// merchant.setHasContract(EnumHasContract.HAS.getCode());
// }
// }
for (WxMerchant merchant : merchants) {
if (record.getRentShopType() != null) {
List<Map<String, Object>> shops = new ArrayList<>();
WxMerchantShop wxMerchantShop = new WxMerchantShop();
wxMerchantShop.setMerchantId(merchant.getId());
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop);
for (WxMerchantShop merchantShop : wxMerchantShopList) {
WxShop shop = new WxShop();
shop.setId(merchantShop.getShopId());
List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop);
if (shoplist.size() > 0) {
shops.add(shoplist.get(0));
}
}
merchant.setShoplist(shops);
}
WxRentContract rc = new WxRentContract();
rc.setMerchantId(merchant.getId());
rc.setTenantId(merchant.getTenantId());
List<WxRentContract> rentContractList = wxRentContractMapper.findList(rc);
if(CollectionUtils.isEmpty(rentContractList)){
merchant.setHasContract(EnumHasContract.NO.getCode());
}else{
merchant.setHasContract(EnumHasContract.HAS.getCode());
}
}
PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants);
return pageInfo;
}


Loading…
Cancel
Save