|
|
@@ -154,6 +154,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
if (order.getOutsource()==null)order.setOutsource(0);//默认非外包
|
|
|
params.put("o", order);
|
|
|
Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
|
|
|
+ List<OrderListBo> list=(List<OrderListBo>) data.getList();
|
|
|
+ for (OrderListBo ob : list) {
|
|
|
+ TOrderBillNew lp=billNewMapper.getLastPayment(ob.getOrderNo());
|
|
|
+ ob.setFinalReceivables(lp.getTransactionAmount().toString());
|
|
|
+ ob.setFinalReceivablesTime(lp.getCreateTimes());
|
|
|
+ }
|
|
|
result.put("pagination", data);
|
|
|
Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order);
|
|
|
result.put("count", count);
|