diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 6cd8b5cbf..1df48c3e6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -131,12 +131,16 @@ public class WxMerchantController extends BaseController { @ApiOperation("子商户列表查询") @GetMapping("/subMerchantList") - @ApiImplicitParam(name = "subName", value = "subName", dataType = "Long", paramType = "query", required = true) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "子商户列表查询") - public ResultData subMerchantList(String subName) { + public ResultData subMerchantList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList"); - List merchants = wxMerchantService.subMerchantList(subName); - return new ResultData(merchants); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + PageInfo pageInfo = wxMerchantService.subMerchantList(wxMerchant, pageNum, pageSize); + return new ResultData(pageInfo); } @ApiOperation("分页列表接口") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 351e07485..7e56a0987 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -428,5 +428,7 @@ public class WxMerchant extends TenantEntity { private Integer hasCarVendor; @TableField(exist = false) private Integer noCarVendor; + @TableField(exist = false) + private List merchantIds; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 1b14de1ae..7b0f6e395 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -58,5 +58,4 @@ public interface WxMerchantMapper extends CommonMapper { List getMerchantListByIds(@Param("relationIds") List relationIds); - List getSubMerchantListByIds(@Param("merchantIds") List merchantIds,@Param("subName") String subName); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index aeddceb80..be62a49f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -218,6 +218,6 @@ public interface WxMerchantService { List relationList(Long regionId); - List subMerchantList(String subName); + PageInfo subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index bdf1f2c69..330d0b4b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2076,9 +2076,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { * 查询剩余子商户 */ @Override - public List subMerchantList(String subName) { + public PageInfo subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { //查询已经被选择了的子商户 List merchantIds = wxMerchantRelationService.getRelationByRegionId(null); - return wxMerchantMapper.getSubMerchantListByIds(merchantIds,subName); + wxMerchant.setMerchantIds(merchantIds); + PageInfo pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(wxMerchant)); + return pageInfo; } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 9448c93cf..6536170cd 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -180,6 +180,12 @@ #{notInIdItem} + + and m.id NOT IN + + #{idItem} + + order by ${sortColumns} @@ -462,19 +468,4 @@ - -