diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index ab6475d73..69050b33a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -23,8 +23,8 @@ public class WxShopController extends BaseController private WxShopService wxShopService; private Logger logger = Logger.getLogger(WxShopController.class); - - @ApiOperation("分页列表接口") + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -32,6 +32,8 @@ public class WxShopController extends BaseController public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { if (null == wxShop) wxShop = new WxShop(); wxShop.setTenantId(getTenantId()); + wxShop.setSortColumns(WxShop.Field.Id_DESC); + final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index 02faf6fde..22f79da4a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -239,7 +239,7 @@ public class WxShop implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + this.sortColumns=sb.toString(); } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 138854892..1aed868dd 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -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 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 merchantShops = wxMerchantShopMapper.findList(merchantShop); + + PageHelper.startPage(pageIndex, pageSize); + List merchants = wxMerchantMapper.findList(record); + for(WxMerchant merchant:merchants){ + List 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 pageInfo = new PageInfo<>(merchants); + return pageInfo; } @Override