|
|
|
@@ -134,7 +134,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Map<Long,WxCUserBasicInfo> getUserMap(BaseTenantEntity tenantEntity,List<Long> cUserIdList) { |
|
|
|
private Map<Long,WxCUserBasicInfo> getUserMap(TenantEntity tenantEntity,List<Long> cUserIdList) { |
|
|
|
Map<Long,WxCUserBasicInfo> userMap = new HashMap<Long,WxCUserBasicInfo>(); |
|
|
|
if (cUserIdList.size() > 0) { |
|
|
|
WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo(); |
|
|
|
@@ -151,7 +151,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
return userMap; |
|
|
|
} |
|
|
|
|
|
|
|
private Map<Long,String> getMerchantNameMap(BaseTenantEntity tenantEntity,List<Long> merchantIdList) { |
|
|
|
private Map<Long,String> getMerchantNameMap(TenantEntity tenantEntity,List<Long> merchantIdList) { |
|
|
|
Map<Long,String> merchantNameMap = new HashMap<Long,String>(); |
|
|
|
if (merchantIdList !=null && merchantIdList.size() > 0) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
@@ -168,7 +168,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
return merchantNameMap; |
|
|
|
} |
|
|
|
|
|
|
|
private Map<Long,String> getMallUserInfoOperatorMap(BaseTenantEntity tenantEntity,List<Long> mallUserInfoOperatorIdList) { |
|
|
|
private Map<Long,String> getMallUserInfoOperatorMap(TenantEntity tenantEntity,List<Long> mallUserInfoOperatorIdList) { |
|
|
|
Map<Long,String> mallUserInfoOperatorMap = new HashMap<Long,String>(); |
|
|
|
if (mallUserInfoOperatorIdList.size() > 0) { |
|
|
|
MallUserInfo mallUserInfoQ = new MallUserInfo(); |
|
|
|
@@ -185,7 +185,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
return mallUserInfoOperatorMap; |
|
|
|
} |
|
|
|
|
|
|
|
private Map<Long,String> getMerchantBUserOperatorMap(BaseTenantEntity tenantEntity,List<Long> merchantBUserOperatorIdList) { |
|
|
|
private Map<Long,String> getMerchantBUserOperatorMap(TenantEntity tenantEntity,List<Long> merchantBUserOperatorIdList) { |
|
|
|
Map<Long,String> merchantBUserOperatorMap = new HashMap<Long,String>(); |
|
|
|
if (merchantBUserOperatorIdList.size() > 0) { |
|
|
|
WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); |
|
|
|
@@ -202,7 +202,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
return merchantBUserOperatorMap; |
|
|
|
} |
|
|
|
|
|
|
|
private List<WxCreditHistoryVo> creditHistoryToVoList(BaseTenantEntity tenantEntity,List<WxCreditHistory> credithistoryList) { |
|
|
|
private List<WxCreditHistoryVo> creditHistoryToVoList(TenantEntity tenantEntity,List<WxCreditHistory> credithistoryList) { |
|
|
|
if (null != credithistoryList) { |
|
|
|
|
|
|
|
List<Long> merchantIdList = new ArrayList<Long>(); |
|
|
|
@@ -295,10 +295,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxCreditHistoryVo> findListMorePage(WxCreditHistory wxCreditHistory,Integer pageIndex, Integer pageSize) { |
|
|
|
TenantEntity tenantEntity = new TenantEntity(); |
|
|
|
tenantEntity.setTenantId(wxCreditHistory.getTenantId()); |
|
|
|
tenantEntity.setParentTenantId(wxCreditHistory.getParentTenantId()); |
|
|
|
|
|
|
|
String merchantName = StringUtils.trimToNull(wxCreditHistory.getMerchantName()); |
|
|
|
if(!StringUtils.isBlank(merchantName)) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(wxCreditHistory); |
|
|
|
merchantQ.updateTenantInfo(tenantEntity); |
|
|
|
merchantQ.setName(merchantName); |
|
|
|
List<Long> merchantIds = wxMerchantMapper.findIdList(merchantQ); |
|
|
|
if (null != merchantIds && merchantIds.size() > 0 ) { |
|
|
|
@@ -319,14 +323,15 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { |
|
|
|
wxCreditHistory.setCUserIds(cUserIds); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
wxCreditHistory.setTenantId(wxCreditHistory.getFinalTenantId()); |
|
|
|
PageInfo<WxCreditHistory> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findListMore(wxCreditHistory)); |
|
|
|
PageInfo<WxCreditHistoryVo> retPageInfo = new PageInfo<WxCreditHistoryVo>(); |
|
|
|
retPageInfo.setPageNum(pageInfo.getPageNum()); |
|
|
|
retPageInfo.setPageSize(pageInfo.getPageSize()); |
|
|
|
retPageInfo.setPages(pageInfo.getPages()); |
|
|
|
retPageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
retPageInfo.setList(creditHistoryToVoList(wxCreditHistory,pageInfo.getList())); |
|
|
|
retPageInfo.setList(creditHistoryToVoList(tenantEntity,pageInfo.getList())); |
|
|
|
return retPageInfo; |
|
|
|
} |
|
|
|
|
|
|
|
|