duhuizhe
2024-05-15 aa2c3d4deba76ade0958ff3ced88396e226a4964
ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityShopRecordController.java
@@ -8,7 +8,7 @@
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;
@@ -47,7 +47,7 @@
    private final ActivityShopRecordService activityShopRecordService;
    private final ChannelInfoService channelInfoService;
    private final ShopServiceClient shopServiceClient;
//    private final ShopServiceClient shopServiceClient;
    @ApiOperation(value = "查询列表", notes = "查询列表")
    @ApiImplicitParams({@ApiImplicitParam(name = "ActivityShopRecordQuery")})
@@ -171,7 +171,8 @@
        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()