| | |
| | | import com.nuvole.base.domain.SysUser; |
| | | import com.nuvole.common.domain.result.CommonResult; |
| | | import com.nuvole.common.domain.result.PageBean; |
| | | import com.nuvole.four.client.ShopServiceClient; |
| | | //import com.nuvole.four.client.ShopServiceClient; |
| | | import com.nuvole.four.contants.Contants; |
| | | import com.nuvole.four.controller.BaseController; |
| | | import com.nuvole.four.domain.ActivityShopRecord; |
| | |
| | | |
| | | private final ActivityShopRecordService activityShopRecordService; |
| | | private final ChannelInfoService channelInfoService; |
| | | private final ShopServiceClient shopServiceClient; |
| | | // private final ShopServiceClient shopServiceClient; |
| | | |
| | | @ApiOperation(value = "查询列表", notes = "查询列表") |
| | | @ApiImplicitParams({@ApiImplicitParam(name = "ActivityShopRecordQuery")}) |
| | |
| | | if(StrUtil.isBlank(queryOrgCode)){ |
| | | queryOrgCode = user.getOrgCode(); |
| | | } |
| | | CommonResult<PageBean<Map>> mapResult = shopServiceClient.getMerchantShopExtendList(queryOrgCode,merchantId,shopName,managerName,channelId,"channelIdNotNull",pageNumber,pageSize); |
| | | // CommonResult<PageBean<Map>> mapResult = shopServiceClient.getMerchantShopExtendList(queryOrgCode,merchantId,shopName,managerName,channelId,"channelIdNotNull",pageNumber,pageSize); |
| | | CommonResult<PageBean<Map>> mapResult = new CommonResult<>(); |
| | | List<Map> mapList = mapResult.getData().getRows(); |
| | | if(!CollectionUtils.isEmpty(mapList)){ |
| | | String[] idsArr = mapList.stream() |