|
|
|
@@ -76,10 +76,17 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMerchantTradeDailyHistory> listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyHistoryMapper.findList(record)); |
|
|
|
public PageInfo<WxMerchantTradeDailyVo> listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize) { |
|
|
|
PageInfo<WxMerchantTradeDailyHistory> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyHistoryMapper.findList(record)); |
|
|
|
PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>(); |
|
|
|
retPageInfo.setPageNum(pageIndex); |
|
|
|
retPageInfo.setPageSize(pageSize); |
|
|
|
retPageInfo.setPages(pageInfo.getPages()); |
|
|
|
retPageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
retPageInfo.setList(toVoList(pageInfo.getList(), record)); |
|
|
|
return retPageInfo; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public WxMerchantTradeDaily getById(Long id) { |
|
|
|
return wxMerchantTradeDailyMapper.selectById(id); |
|
|
|
@@ -196,7 +203,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) { |
|
|
|
|
|
|
|
|
|
|
|
private List<WxMerchantTradeDailyVo> toVoList(List<? extends WxMerchantTradeDaily> list,TenantEntity tenantEntity) { |
|
|
|
if (null == list || list.size() <= 0 ){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
@@ -344,11 +353,12 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); |
|
|
|
String errormsg = "解单数据已存在"; |
|
|
|
if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()) { |
|
|
|
wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate()); |
|
|
|
errormsg = "当天解单数据已存在"; |
|
|
|
//按日还要查询按月的有没有 |
|
|
|
wxMerchantTradeDaily.setReportDateOrMonthLike(tradeDaily.getReportDate()); |
|
|
|
errormsg = "已存在当天或者当月的解单数据"; |
|
|
|
}else if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.MONTH.getCode().intValue()) { |
|
|
|
wxMerchantTradeDaily.setReportDateLike(tradeDaily.getReportDate()); |
|
|
|
errormsg = "当前月已存在解单数据或者已存在当前月按天提报的解单数据"; |
|
|
|
errormsg = "已存在当月的解单数据"; |
|
|
|
} |
|
|
|
|
|
|
|
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); |
|
|
|
|