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

Skip to content

L
liquidnet-bus-v1
Commit 77f16c36 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev' into test

parents 8e9e0851 47158460
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinMemberAuditController.java
View file @ 77f16c36
...@@ -33,7 +33,7 @@ public class KylinMemberAuditController extends BaseController { ...@@ -33,7 +33,7 @@ public class KylinMemberAuditController extends BaseController {
@Autowired @Autowired
private IKylinPerformancesAdminService kylinPerformancesService; private IKylinPerformancesAdminService kylinPerformancesService;
@RequiresPermissions("kylin:performances:memberAudit") //@RequiresPermissions("kylin:performances:member")
@GetMapping() @GetMapping()
public String memberAudit() { public String memberAudit() {
return prefix + "/memberAudit"; return prefix + "/memberAudit";
...@@ -42,7 +42,7 @@ public class KylinMemberAuditController extends BaseController { ...@@ -42,7 +42,7 @@ public class KylinMemberAuditController extends BaseController {
/** /**
* 会员待审核列表 * 会员待审核列表
*/ */
@RequiresPermissions("kylin:performances:recommend:list") //@RequiresPermissions("kylin:performances:member")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list(@RequestParam("title") String title, @RequestParam("pageNum") int page, @RequestParam("pageSize") int size) { public TableDataInfo list(@RequestParam("title") String title, @RequestParam("pageNum") int page, @RequestParam("pageSize") int size) {
...@@ -51,7 +51,7 @@ public class KylinMemberAuditController extends BaseController { ...@@ -51,7 +51,7 @@ public class KylinMemberAuditController extends BaseController {
return getDataTable(result); return getDataTable(result);
} }
@RequiresPermissions("kylin:performances:memberAudit:edit") //@RequiresPermissions("kylin:performances:member")
@GetMapping("/edit/{performancesId}") @GetMapping("/edit/{performancesId}")
public String edit(@PathVariable("performancesId") String performancesId, Integer status, ModelMap mmap) { public String edit(@PathVariable("performancesId") String performancesId, Integer status, ModelMap mmap) {
PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberAuditInfo(performancesId, status); PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberAuditInfo(performancesId, status);
...@@ -59,7 +59,7 @@ public class KylinMemberAuditController extends BaseController { ...@@ -59,7 +59,7 @@ public class KylinMemberAuditController extends BaseController {
return prefix + "/edit"; return prefix + "/edit";
} }
@RequiresPermissions("kylin:performances:memberAudit:save") //@RequiresPermissions("kylin:performances:member")
@PostMapping("/save") @PostMapping("/save")
@ResponseBody @ResponseBody
public AjaxResult save(@RequestParam("performancesId") String performancesId, @RequestParam("status")Integer status, @RequestParam("rejectTxt")String rejectTxt) { public AjaxResult save(@RequestParam("performancesId") String performancesId, @RequestParam("status")Integer status, @RequestParam("rejectTxt")String rejectTxt) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
View file @ 77f16c36
...@@ -48,7 +48,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -48,7 +48,7 @@ public class KylinPerformancesController extends BaseController {
@Autowired @Autowired
private DamaiService damaiService; private DamaiService damaiService;
@RequiresPermissions("kylin:performances:view") //@RequiresPermissions("kylin:performances:view")
@GetMapping() @GetMapping()
public String performances() { public String performances() {
return prefix + "/performances"; return prefix + "/performances";
...@@ -57,7 +57,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -57,7 +57,7 @@ public class KylinPerformancesController extends BaseController {
/** /**
* 查询演出列表 * 查询演出列表
*/ */
@RequiresPermissions("kylin:performances:list") //@RequiresPermissions("kylin:performances:view")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) { public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
...@@ -69,7 +69,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -69,7 +69,7 @@ public class KylinPerformancesController extends BaseController {
return rspData; return rspData;
} }
@RequiresPermissions("kylin:performances:detail") //@RequiresPermissions("kylin:performances:view")
@GetMapping(value = "/details/{performancesId}") @GetMapping(value = "/details/{performancesId}")
public String performanceDetails(@PathVariable("performancesId") String performancesId, ModelMap mmap) { public String performanceDetails(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
KylinPerformanceMisVo result = null; KylinPerformanceMisVo result = null;
...@@ -79,21 +79,21 @@ public class KylinPerformancesController extends BaseController { ...@@ -79,21 +79,21 @@ public class KylinPerformancesController extends BaseController {
} }
@PostMapping(value = "/audit") @PostMapping(value = "/audit")
@RequiresPermissions("kylin:performances:audit") //@RequiresPermissions("kylin:performances:view")
@ResponseBody @ResponseBody
public AjaxResult performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) { public AjaxResult performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
boolean result = kylinPerformancesService.performanceAudit(performancesId, status, rejectTxt); boolean result = kylinPerformancesService.performanceAudit(performancesId, status, rejectTxt);
return toAjax(result); return toAjax(result);
} }
@RequiresPermissions("kylin:performances:change") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/isShow") @PostMapping(value = "/isShow")
@ResponseBody @ResponseBody
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));
} }
@RequiresPermissions("kylin:performances:member") //@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) {
PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberInfo(performancesId); PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberInfo(performancesId);
...@@ -101,7 +101,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -101,7 +101,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/memberInfo"; return prefix + "/memberInfo";
} }
@RequiresPermissions("kylin:performances:member:change") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/memberInfo/submit") @PostMapping(value = "/memberInfo/submit")
@ResponseBody @ResponseBody
public AjaxResult memberInfo(PerformanceMemberAuditParam performanceMemberAuditParam) { public AjaxResult memberInfo(PerformanceMemberAuditParam performanceMemberAuditParam) {
...@@ -109,7 +109,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -109,7 +109,7 @@ public class KylinPerformancesController extends BaseController {
return toAjax(result); return toAjax(result);
} }
@RequiresPermissions("kylin:performances:performanceStatic") //@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) {
//获取演出详情 //获取演出详情
...@@ -136,7 +136,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -136,7 +136,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/performancesStatic"; return prefix + "/performancesStatic";
} }
@RequiresPermissions("kylin:performances:damai") //@RequiresPermissions("kylin:performances:view")
@GetMapping(value = "/damai/{performancesId}") @GetMapping(value = "/damai/{performancesId}")
public String damai(@PathVariable("performancesId") String performancesId, ModelMap mmap) { public String damai(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
KylinPerformanceDamaiVo result = kylinPerformancesService.getPerformanceDamai(performancesId); KylinPerformanceDamaiVo result = kylinPerformancesService.getPerformanceDamai(performancesId);
...@@ -144,7 +144,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -144,7 +144,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/damai"; return prefix + "/damai";
} }
@RequiresPermissions("kylin:performances:agent") //@RequiresPermissions("kylin:performances:view")
@GetMapping(value = "/agent/{performancesId}") @GetMapping(value = "/agent/{performancesId}")
public String agent(@PathVariable("performancesId") String performancesId, ModelMap mmap) { public String agent(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
KylinPerformanceAgentVo result = kylinPerformancesService.getPerformanceAgent(performancesId); KylinPerformanceAgentVo result = kylinPerformancesService.getPerformanceAgent(performancesId);
...@@ -152,7 +152,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -152,7 +152,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/agent"; return prefix + "/agent";
} }
@RequiresPermissions("kylin:performances:agent") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/agent/change") @PostMapping(value = "/agent/change")
@ResponseBody @ResponseBody
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) {
...@@ -160,7 +160,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -160,7 +160,7 @@ public class KylinPerformancesController extends BaseController {
return toAjax(result); return toAjax(result);
} }
@RequiresPermissions("kylin:performances:damai") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/damai/change") @PostMapping(value = "/damai/change")
@ResponseBody @ResponseBody
public AjaxResult changeSysDamai(@RequestParam("params") String params) { public AjaxResult changeSysDamai(@RequestParam("params") String params) {
...@@ -170,7 +170,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -170,7 +170,7 @@ public class KylinPerformancesController extends BaseController {
return toAjax(result); return toAjax(result);
} }
@RequiresPermissions("kylin:performances:damai") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/sync/damai") @PostMapping(value = "/sync/damai")
@ResponseBody @ResponseBody
public AjaxResult syncDamai(@RequestParam("performancesId") String performancesId) { public AjaxResult syncDamai(@RequestParam("performancesId") String performancesId) {
...@@ -178,7 +178,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -178,7 +178,7 @@ public class KylinPerformancesController extends BaseController {
return toAjax(result); return toAjax(result);
} }
@RequiresPermissions("kylin:performances:refundConfig") //@RequiresPermissions("kylin:performances:view")
@GetMapping(value = "/refundConfig/{performancesId}") @GetMapping(value = "/refundConfig/{performancesId}")
public String getRefundConfig(@PathVariable("performancesId") String performancesId, ModelMap mmap) { public String getRefundConfig(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
PerformanceRefundConfigVo result = kylinPerformancesService.getRefundConfig(performancesId); PerformanceRefundConfigVo result = kylinPerformancesService.getRefundConfig(performancesId);
...@@ -186,7 +186,7 @@ public class KylinPerformancesController extends BaseController { ...@@ -186,7 +186,7 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/refundConfig"; return prefix + "/refundConfig";
} }
@RequiresPermissions("kylin:performances:refundConfig") //@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/refundConfig/change") @PostMapping(value = "/refundConfig/change")
@ResponseBody @ResponseBody
public AjaxResult changeRefundConfig(@RequestParam("performancesId") String performancesId, public AjaxResult changeRefundConfig(@RequestParam("performancesId") String performancesId,
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
View file @ 77f16c36
...@@ -133,7 +133,7 @@ create table adam_addresses ...@@ -133,7 +133,7 @@ create table adam_addresses
province varchar(60) not null comment '省份', province varchar(60) not null comment '省份',
city varchar(60) not null comment '城市', city varchar(60) not null comment '城市',
county varchar(60) not null comment '区县', county varchar(60) not null comment '区县',
address tinytext not null comment '详细地址', address text not null comment '详细地址',
is_default boolean not null default false comment '是否为默认:0-否,1-是,第一个默认1', is_default boolean not null default false comment '是否为默认:0-否,1-是,第一个默认1',
state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID', state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
created_at datetime(3) not null, created_at datetime(3) not null,
......
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