eason.qian 8 years ago
parent 3fff080c23
commit f4ff5aa2b2

@ -74,8 +74,8 @@ public class PartnerCardDashboardController {
} }
@RequestMapping("/{client_id}/settlement_logs/{detailId}") @RequestMapping("/{client_id}/settlement_logs/{detailId}")
public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable String detailId) { public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable int detailId,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
return cleanService.getCleanLogTransactions(client_id, detailId); return cleanService.getCleanLogTransactions(detailId, manager);
} }

@ -257,6 +257,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
channelsObj.put(channel.getString("channel"), channel); channelsObj.put(channel.getString("channel"), channel);
} }
cleanLog.put("channels", channelsObj); cleanLog.put("channels", channelsObj);
cleanLog.put("client_moniker", client.getString("client_moniker"));
return cleanLog; return cleanLog;
} }

Loading…
Cancel
Save