|
|
|
@@ -194,11 +194,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
for (Map<String, Object> map:maps) { |
|
|
|
Integer billType = ((Long)map.get("billTypeValue")).intValue(); |
|
|
|
if(EnumBillType.SETTLE.getCode().equals(billType)){ |
|
|
|
logger.info("-----------------"); |
|
|
|
Long id = (Long)map.get("id"); |
|
|
|
WxBillSettle settle = wxBillSettleService.getById(id,EnumFilterSettle.YES.getCode()); |
|
|
|
BigDecimal money = new BigDecimal(settle.getBalance()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP); |
|
|
|
map.put("owe",money); |
|
|
|
map.put("owe",settle.getBalance()); |
|
|
|
settle = wxBillSettleService.getById(id,EnumFilterSettle.NO.getCode()); |
|
|
|
map.put("receivePay",settle.getBalance()); |
|
|
|
} |
|
|
|
} |
|
|
|
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(maps); |
|
|
|
@@ -208,11 +208,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
for (Map<String, Object> map:maps) { |
|
|
|
Integer billType = ((Long)map.get("billTypeValue")).intValue(); |
|
|
|
if(EnumBillType.SETTLE.getCode().equals(billType)){ |
|
|
|
logger.info("-----------------"); |
|
|
|
Long id = (Long)map.get("id"); |
|
|
|
WxBillSettle settle = wxBillSettleService.getById(id,EnumFilterSettle.YES.getCode()); |
|
|
|
BigDecimal money = new BigDecimal(settle.getBalance()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP); |
|
|
|
map.put("owe",money); |
|
|
|
map.put("owe",settle.getBalance()); |
|
|
|
settle = wxBillSettleService.getById(id,EnumFilterSettle.NO.getCode()); |
|
|
|
map.put("receivePay",settle.getBalance()); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(maps); |
|
|
|
|