|
|
|
@@ -15,6 +15,8 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@Service |
|
|
|
public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
@@ -36,7 +38,23 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); |
|
|
|
|
|
|
|
WxMerchantShop merchantShop = new WxMerchantShop(); |
|
|
|
merchantShop.setTenantId(record.getTenantId()); |
|
|
|
merchantShop.setIsDel(0); |
|
|
|
List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShop); |
|
|
|
|
|
|
|
PageHelper.startPage(pageIndex, pageSize); |
|
|
|
List<WxMerchant> merchants = wxMerchantMapper.findList(record); |
|
|
|
for(WxMerchant merchant:merchants){ |
|
|
|
List<WxMerchantShop> collect = merchantShops.stream().filter(ms -> ms.getMerchantId().equals(merchant.getId())).collect(Collectors.toList()); |
|
|
|
if(collect!=null && collect.size()>0){ |
|
|
|
merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); |
|
|
|
merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); |
|
|
|
} |
|
|
|
} |
|
|
|
PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants); |
|
|
|
return pageInfo; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|