diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index 6011dc2a3..fc4721436 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -309,17 +309,18 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = new TenantEntity(); - tenantEntity.setTenantId(dto.getTenantId()); - tenantEntity.setParentTenantId(dto.getParentTenantId()); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - long count = 0l; - for (TenantEntity te:tenantEntitys) { - dto.updateTenantInfo(te); - count += ttCUserMapper.findCount(dto); - } - dto.updateTenantInfo(tenantEntity); - return count; + return ttCUserMapper.findCount(dto); +// TenantEntity tenantEntity = new TenantEntity(); +// tenantEntity.setTenantId(dto.getTenantId()); +// tenantEntity.setParentTenantId(dto.getParentTenantId()); +// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); +// long count = 0l; +// for (TenantEntity te:tenantEntitys) { +// dto.updateTenantInfo(te); +// count += ttCUserMapper.findCount(dto); +// } +// dto.updateTenantInfo(tenantEntity); +// return count; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index 8c70c1c97..ec967304b 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -322,17 +322,18 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = new TenantEntity(); - tenantEntity.setTenantId(dto.getTenantId()); - tenantEntity.setParentTenantId(dto.getParentTenantId()); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - long count = 0l; - for (TenantEntity te:tenantEntitys) { - dto.updateTenantInfo(te); - count += wxCUserMapper.findCount(dto); - } - dto.updateTenantInfo(tenantEntity); - return count; + return wxCUserMapper.findCount(dto); +// TenantEntity tenantEntity = new TenantEntity(); +// tenantEntity.setTenantId(dto.getTenantId()); +// tenantEntity.setParentTenantId(dto.getParentTenantId()); +// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); +// long count = 0l; +// for (TenantEntity te:tenantEntitys) { +// dto.updateTenantInfo(te); +// count += wxCUserMapper.findCount(dto); +// } +// dto.updateTenantInfo(tenantEntity); +// return count; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java index 2daf0a469..6baf29f04 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java @@ -1144,7 +1144,10 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR } for (int i = 0;i < array.size();i++) { JSONObject jsonObject = array.getJSONObject(i); - String media_id = jsonObject.getString("media_id"); + String media_id = null; + if(jsonObject != null){ + media_id = jsonObject.getString("media_id"); + } if(StringUtils.isNotBlank(media_id)){ list.add(media_id); }