|
|
@ -55,17 +55,8 @@ public class BillOrderServiceImpl implements BillOrderService {
|
|
|
|
if (bill.getIntValue("client_id") != client_id) {
|
|
|
|
if (bill.getIntValue("client_id") != client_id) {
|
|
|
|
throw new BadRequestException("You have no right to check this bill");
|
|
|
|
throw new BadRequestException("You have no right to check this bill");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PageList<JSONObject> list = billOrderMapper.queryWithWechatInfo(bill_id, queryBillOrderBean.toParams(),
|
|
|
|
PageList<JSONObject> list = billOrderMapper.query(bill_id, queryBillOrderBean.toParams(),
|
|
|
|
new PageBounds(queryBillOrderBean.getPage(), queryBillOrderBean.getLimit()));
|
|
|
|
new PageBounds(queryBillOrderBean.getPage(), queryBillOrderBean.getLimit()));
|
|
|
|
for (JSONObject jsonObject : list) {
|
|
|
|
|
|
|
|
if ("Alipay".equals(jsonObject.getString("channel"))) {
|
|
|
|
|
|
|
|
JSONObject alipayInfo = customerRelationAlipayMapper.findCustomerByUserId(jsonObject.getString("customer_id"));
|
|
|
|
|
|
|
|
if (alipayInfo != null) {
|
|
|
|
|
|
|
|
jsonObject.put("nickname", alipayInfo.getString("nickname"));
|
|
|
|
|
|
|
|
jsonObject.put("headimg", alipayInfo.getString("headimg"));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return PageListUtils.buildPageListResult(list);
|
|
|
|
return PageListUtils.buildPageListResult(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|