|
|
|
@@ -85,20 +85,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { |
|
|
|
//更新各账单状态 |
|
|
|
updateBillStatus(record); |
|
|
|
//得到当前月 |
|
|
|
String month = DateUtils.getSystemTime("yyyy-MM"); |
|
|
|
//获取账单信息-欠缴笔数、欠缴金额、结清笔数、结清金额 |
|
|
|
Object billInfo = getBillInfo(record.getTenantId(), month); |
|
|
|
//设置查询参数-当前月 |
|
|
|
record.setMonth(month); |
|
|
|
//分页-页数、条数 |
|
|
|
PageHelper.startPage(pageIndex, pageSize); |
|
|
|
//查询 |
|
|
|
List<Map<String, Object>> billList = wxBillAllMapper.list(record); |
|
|
|
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billList); |
|
|
|
//返回值 |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
result.put("billInfo", billInfo); |
|
|
|
result.put("pageInfo", pageInfo); |
|
|
|
return result; |
|
|
|
} |
|
|
|
@@ -498,10 +488,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
logger.info("更新各账单状态结束"); |
|
|
|
} |
|
|
|
|
|
|
|
private Object getBillInfo(String tenantId, String month) { |
|
|
|
WxBillAll record = new WxBillAll(); |
|
|
|
record.setTenantId(tenantId); |
|
|
|
record.setMonth(month); |
|
|
|
@Override |
|
|
|
public Object getBillInfo(WxBillAll record) { |
|
|
|
|
|
|
|
record.setRentShopType(EnumRentShopType.SHOP.getCode()); |
|
|
|
record.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
|
Map<String, Object> oweInfoForShop = wxBillAllMapper.queryOweInfo(record); |
|
|
|
@@ -514,7 +503,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
record.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
|
Map<String, Object> paidInfoForPoint = wxBillAllMapper.queryPaidInfo(record); |
|
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>(5); |
|
|
|
Map<String, Object> result = new HashMap<>(4); |
|
|
|
result.put("oweInfoForShop", oweInfoForShop); |
|
|
|
result.put("paidInfoForShop", paidInfoForShop); |
|
|
|
result.put("oweInfoForPoint", oweInfoForPoint); |
|
|
|
|