|
|
|
@ -28,32 +28,37 @@ public class CustomController {
|
|
|
|
|
@Resource
|
|
|
|
|
private CustomService customService;
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/{report_id}",method = RequestMethod.GET)
|
|
|
|
|
@RequestMapping(value = "/{report_id}", method = RequestMethod.GET)
|
|
|
|
|
public JSONObject findOne(@PathVariable String report_id) {
|
|
|
|
|
return customService.findOneWithDetail(report_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/query",method = RequestMethod.GET)
|
|
|
|
|
public JSONObject queryWithTran(@ModelAttribute(CommonConsts.PARTNER_STATUS)JSONObject partner, QueryCustomVo queryCustomVo) {
|
|
|
|
|
@RequestMapping(value = "/query", method = RequestMethod.GET)
|
|
|
|
|
public JSONObject queryWithTran(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, QueryCustomVo queryCustomVo) {
|
|
|
|
|
JSONObject param = queryCustomVo.toParam();
|
|
|
|
|
param.put("client_id",partner.getIntValue("client_id"));
|
|
|
|
|
return customService.query(param,queryCustomVo.getPage(),queryCustomVo.getLimit());
|
|
|
|
|
param.put("client_id", partner.getIntValue("client_id"));
|
|
|
|
|
return customService.query(param, queryCustomVo.getPage(), queryCustomVo.getLimit());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "",method = RequestMethod.POST)
|
|
|
|
|
@RequestMapping(value = "", method = RequestMethod.POST)
|
|
|
|
|
@ResponseBody
|
|
|
|
|
public void add(@RequestBody AddCustomVO addCustomVO) {
|
|
|
|
|
customService.add(addCustomVO.getOrder_id(),addCustomVO.getMch_custom_no(),addCustomVO.getCustom(),addCustomVO.getMch_custom_name(),addCustomVO.getSubOrders());
|
|
|
|
|
customService.add(addCustomVO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/channelCustom",method = RequestMethod.GET)
|
|
|
|
|
@RequestMapping(value = "/channelCustom", method = RequestMethod.GET)
|
|
|
|
|
public List<JSONObject> channelCustomConfigs(@RequestParam String channel) {
|
|
|
|
|
return customService.channelCustomConfigs(channel);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/{report_id}/resend",method = RequestMethod.POST)
|
|
|
|
|
@RequestMapping(value = "/{report_id}/resend", method = RequestMethod.POST)
|
|
|
|
|
public void resend(@PathVariable String report_id) {
|
|
|
|
|
customService.resend(report_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/{report_id}/customResult", method = RequestMethod.GET)
|
|
|
|
|
public void getCustomResult(@PathVariable String report_id) {
|
|
|
|
|
customService.getCustomResult(report_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|