记得上下班打卡 | git大法好,push需谨慎

Commit 4358b898 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev_admin_log' into pre

parents edbb8ecd 9efe0011
...@@ -134,4 +134,9 @@ public enum BusinessType ...@@ -134,4 +134,9 @@ public enum BusinessType
* 会员订单退款 * 会员订单退款
*/ */
MORDER_REFUND, MORDER_REFUND,
/**
* 修改
*/
PERFORMANCE_SAVE,
} }
...@@ -84,7 +84,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -84,7 +84,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/details"; return prefix + "/details";
} }
@Log(title = "演出列表", businessType = BusinessType.AUDIT) @Log(title = "演出审核", businessType = BusinessType.AUDIT)
@PostMapping(value = "/audit") @PostMapping(value = "/audit")
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@ResponseBody @ResponseBody
...@@ -96,11 +96,12 @@ public class KylinPerformancesController extends BaseController { ...@@ -96,11 +96,12 @@ public class KylinPerformancesController extends BaseController {
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/isShow") @PostMapping(value = "/isShow")
@ResponseBody @ResponseBody
@Log(title = "演出管理:是否显示", businessType = BusinessType.PERFORMANCE_SAVE)
public AjaxResult setIsShow(String performancesId, Integer isShow) { public AjaxResult setIsShow(String performancesId, Integer isShow) {
return toAjax(kylinPerformancesService.setIsShow(performancesId, isShow)); return toAjax(kylinPerformancesService.setIsShow(performancesId, isShow));
} }
@Log(title = "演出列表", businessType = BusinessType.DETAIL) // @Log(title = "演出列表", businessType = BusinessType.DETAIL)
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@GetMapping(value = "/memberInfo/{performancesId}") @GetMapping(value = "/memberInfo/{performancesId}")
public String memberInfo(@PathVariable("performancesId") String performancesId, ModelMap mmap) { public String memberInfo(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
...@@ -109,7 +110,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -109,7 +110,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/memberInfo"; return prefix + "/memberInfo";
} }
@Log(title = "演出列表", businessType = BusinessType.UPDATE) @Log(title = "演出管理:提交会员信息", businessType = BusinessType.PERFORMANCE_SAVE)
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/memberInfo/submit") @PostMapping(value = "/memberInfo/submit")
@ResponseBody @ResponseBody
...@@ -118,7 +119,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -118,7 +119,7 @@ public class KylinPerformancesController extends BaseController {
return toAjax(result); return toAjax(result);
} }
@Log(title = "演出列表-演出数据", businessType = BusinessType.LIST) // @Log(title = "演出列表-演出数据", businessType = BusinessType.LIST)
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@GetMapping(value = "/performanceStatic/{performancesId}") @GetMapping(value = "/performanceStatic/{performancesId}")
public String performanceStatic(@PathVariable("performancesId") String performancesId, ModelMap mmap) { public String performanceStatic(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
...@@ -172,6 +173,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -172,6 +173,7 @@ public class KylinPerformancesController extends BaseController {
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/agent/change") @PostMapping(value = "/agent/change")
@ResponseBody @ResponseBody
@Log(title = "演出管理:票种代理", businessType = BusinessType.PERFORMANCE_SAVE)
public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) { public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
boolean result = kylinPerformancesService.changeTicketAgent(performancesId, ticketsId, status); boolean result = kylinPerformancesService.changeTicketAgent(performancesId, ticketsId, status);
return toAjax(result); return toAjax(result);
...@@ -179,6 +181,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -179,6 +181,7 @@ public class KylinPerformancesController extends BaseController {
@PostMapping(value = "/payTxt/change") @PostMapping(value = "/payTxt/change")
@ResponseBody @ResponseBody
@Log(title = "演出管理:支付文案", businessType = BusinessType.PERFORMANCE_SAVE)
public AjaxResult changeTicketPayTxt(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("payTxt") String payTxt) { public AjaxResult changeTicketPayTxt(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("payTxt") String payTxt) {
boolean result = kylinPerformancesService.changeTicketPayTxt(performancesId, ticketsId, payTxt); boolean result = kylinPerformancesService.changeTicketPayTxt(performancesId, ticketsId, payTxt);
return toAjax(result); return toAjax(result);
...@@ -213,6 +216,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -213,6 +216,7 @@ public class KylinPerformancesController extends BaseController {
//@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/refundConfig/change") @PostMapping(value = "/refundConfig/change")
@ResponseBody @ResponseBody
@Log(title = "演出管理:退款配置", businessType = BusinessType.PERFORMANCE_SAVE)
public AjaxResult changeRefundConfig(@RequestParam("performancesId") String performancesId, public AjaxResult changeRefundConfig(@RequestParam("performancesId") String performancesId,
@RequestParam("isCanRefund") Integer isCanRefund, @RequestParam("isCanRefund") Integer isCanRefund,
@RequestParam("refundOpenTime") String refundOpenTime, @RequestParam("refundOpenTime") String refundOpenTime,
...@@ -249,6 +253,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -249,6 +253,7 @@ public class KylinPerformancesController extends BaseController {
@PostMapping(value = "/transferConfig/change") @PostMapping(value = "/transferConfig/change")
@ResponseBody @ResponseBody
@Log(title = "演出管理:转赠配置", businessType = BusinessType.PERFORMANCE_SAVE)
public AjaxResult changeTransferConfig(@RequestParam("performancesId") String performancesId, public AjaxResult changeTransferConfig(@RequestParam("performancesId") String performancesId,
@RequestParam("isCanTransfer") Integer isCanTransfer, @RequestParam("isCanTransfer") Integer isCanTransfer,
@RequestParam("transferStartTime") String transferStartTime, @RequestParam("transferStartTime") String transferStartTime,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment