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

Commit 4d7f1513 authored by 胡佳晨's avatar 胡佳晨

添加超级账号

parent 5e90e0b1
...@@ -73,11 +73,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -73,11 +73,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
String result; String result;
String merchantId = CurrentUtil.getCurrentUid(); String merchantId = CurrentUtil.getCurrentUid();
step1Param.setMerchantId(merchantId); step1Param.setMerchantId(merchantId);
if (!mongoMerchantUtils.judgeIsPermission(step1Param.getPerformancesId(), step1Param.getMerchantId(), new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return "无权限";
}
// 无 performancesId 则 创建 // 无 performancesId 则 创建
if (null == step1Param.getPerformancesId()) { if (null == step1Param.getPerformancesId()) {
result = createStep1(step1Param); result = createStep1(step1Param);
...@@ -87,6 +82,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -87,6 +82,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
result = createStep1(step1Param); result = createStep1(step1Param);
log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "createStep1", step1Param, result)); log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "createStep1", step1Param, result));
} else {// 修改 } else {// 修改
if (!mongoMerchantUtils.judgeIsPermission(step1Param.getPerformancesId(), step1Param.getMerchantId(), new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return "无权限";
}
result = updateStep1(step1Param); result = updateStep1(step1Param);
log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "updateStep1", step1Param, result)); log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "updateStep1", step1Param, result));
} }
...@@ -193,11 +193,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -193,11 +193,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
public ResponseDto<String> step2(PerformanceStep2Param step2Param) { public ResponseDto<String> step2(PerformanceStep2Param step2Param) {
ResponseDto<String> result = null; ResponseDto<String> result = null;
step2Param.setMerchantId(CurrentUtil.getCurrentUid()); step2Param.setMerchantId(CurrentUtil.getCurrentUid());
if (!mongoMerchantUtils.judgeIsPermission(step2Param.getPerformancesId(), step2Param.getMerchantId(), new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
// 无 performancesId 则 创建 // 无 performancesId 则 创建
if (!step2Param.getPerformancesId().isEmpty()) { // 获取 create 数据 status = 0 或 无数据 创建 if (!step2Param.getPerformancesId().isEmpty()) { // 获取 create 数据 status = 0 或 无数据 创建
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(step2Param.getPerformancesId()); KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(step2Param.getPerformancesId());
...@@ -205,6 +200,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -205,6 +200,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
result = createStep2(step2Param); result = createStep2(step2Param);
log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result)); log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result));
} else if (vo.getAppStatus() == 1 || vo.getAppStatus() == 3 || vo.getAppStatus() == 6 || vo.getAppStatus() == 7 || vo.getAppStatus() == 8 || vo.getAppStatus() == 9) {// 修改 } else if (vo.getAppStatus() == 1 || vo.getAppStatus() == 3 || vo.getAppStatus() == 6 || vo.getAppStatus() == 7 || vo.getAppStatus() == 8 || vo.getAppStatus() == 9) {// 修改
if (!mongoMerchantUtils.judgeIsPermission(step2Param.getPerformancesId(), step2Param.getMerchantId(), new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
result = updateStep2(step2Param); result = updateStep2(step2Param);
log.info(UserPathDto.setPartnerData("0", "updateStep2(step2Param", step2Param, result)); log.info(UserPathDto.setPartnerData("0", "updateStep2(step2Param", step2Param, result));
} else if (vo.getAppStatus() == 10) { } else if (vo.getAppStatus() == 10) {
......
package com.liquidnet.service.merchant.service.impl; package com.liquidnet.service.merchant.service.impl;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -11,7 +10,6 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; ...@@ -11,7 +10,6 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst;
import com.liquidnet.service.merchant.util.*; import com.liquidnet.service.merchant.util.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -46,17 +44,8 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart ...@@ -46,17 +44,8 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
@Override @Override
public ResponseDto<KylinTicketTimesPartnerVo> createTimesSummary(CreateTicketTimesParam createTicketTimesParam) { public ResponseDto<KylinTicketTimesPartnerVo> createTimesSummary(CreateTicketTimesParam createTicketTimesParam) {
ResponseDto<KylinTicketTimesPartnerVo> ticketTimesPartnerVo; ResponseDto<KylinTicketTimesPartnerVo> ticketTimesPartnerVo;
String merchantId = CurrentUtil.getCurrentUid();
if (!mongoMerchantUtils.judgeIsPermission(createTicketTimesParam.getPerformancesId(), merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
//获取演出状态 //获取演出状态
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVoNoMerchant(createTicketTimesParam.getPerformancesId()); KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVoNoMerchant(createTicketTimesParam.getPerformancesId());
if (null != vo && !vo.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
if (null == vo) { if (null == vo) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(UserPathDto.setPartnerData("0", "createTimes", createTicketTimesParam, ticketTimesPartnerVo)); log.info(UserPathDto.setPartnerData("0", "createTimes", createTicketTimesParam, ticketTimesPartnerVo));
...@@ -156,12 +145,6 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart ...@@ -156,12 +145,6 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
public ResponseDto<String> deleteTimes(String ticketTimesId, String performanceId) { public ResponseDto<String> deleteTimes(String ticketTimesId, String performanceId) {
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
String merchantId = CurrentUtil.getCurrentUid();
if (!mongoMerchantUtils.judgeIsPermission(performanceId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
KylinTicketTimesPartnerVo data = mongoMerchantUtils.getTicketTimesPartnerVo(ticketTimesId); KylinTicketTimesPartnerVo data = mongoMerchantUtils.getTicketTimesPartnerVo(ticketTimesId);
if (data.getStatus() == 0) { if (data.getStatus() == 0) {
return ResponseDto.failure(ErrorMapping.get(20106)); return ResponseDto.failure(ErrorMapping.get(20106));
...@@ -202,16 +185,6 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart ...@@ -202,16 +185,6 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
@Override @Override
public ResponseDto<KylinTicketTimesPartnerVo> changeTimes(CreateTicketTimesParam createTicketTimesParam) { public ResponseDto<KylinTicketTimesPartnerVo> changeTimes(CreateTicketTimesParam createTicketTimesParam) {
try { try {
String merchantId = CurrentUtil.getCurrentUid();
if (!mongoMerchantUtils.judgeIsPermission(createTicketTimesParam.getPerformancesId(), merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVoNoMerchant(createTicketTimesParam.getPerformancesId());
if (null != vo && !vo.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
String title = ""; String title = "";
if (createTicketTimesParam.getType() == 1) { if (createTicketTimesParam.getType() == 1) {
......
...@@ -49,20 +49,11 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -49,20 +49,11 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
@Override @Override
public ResponseDto<KylinTicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam) { public ResponseDto<KylinTicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam) {
String merchantId = CurrentUtil.getCurrentUid();
ResponseDto<KylinTicketPartnerVo> ticketPartnerVo; ResponseDto<KylinTicketPartnerVo> ticketPartnerVo;
//获取演出状态 //获取演出状态
KylinTicketTimesPartnerVo timesPartnerVo = mongoMerchantUtils.getTicketTimesPartnerVo(ticketCreateParam.getTimesId()); KylinTicketTimesPartnerVo timesPartnerVo = mongoMerchantUtils.getTicketTimesPartnerVo(ticketCreateParam.getTimesId());
if (!mongoMerchantUtils.judgeIsPermission(timesPartnerVo.getPerformancesId(), merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
if (null != timesPartnerVo) { if (null != timesPartnerVo) {
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVoNoMerchant(timesPartnerVo.getPerformancesId()); KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVoNoMerchant(timesPartnerVo.getPerformancesId());
if (null != vo && !vo.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
if (null == vo) { if (null == vo) {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0", "createTicket", ticketCreateParam, ticketPartnerVo)); log.info(UserPathDto.setPartnerData("0", "createTicket", ticketCreateParam, ticketPartnerVo));
...@@ -191,13 +182,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -191,13 +182,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
@Override @Override
public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) { public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
try { try {
String merchantId = CurrentUtil.getCurrentUid();
KylinTicketTimesPartnerVo ticketTimeRelation = mongoMerchantUtils.getTicketTimesPartnerVo(ticketCreateParam.getTimesId()); KylinTicketTimesPartnerVo ticketTimeRelation = mongoMerchantUtils.getTicketTimesPartnerVo(ticketCreateParam.getTimesId());
if (!mongoMerchantUtils.judgeIsPermission(ticketTimeRelation.getPerformancesId(), merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(ticketTimeRelation.getPerformancesId()); PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(ticketTimeRelation.getPerformancesId());
if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) { if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
return ResponseDto.failure(ErrorMapping.get("20112")); return ResponseDto.failure(ErrorMapping.get("20112"));
...@@ -246,13 +231,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -246,13 +231,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
@Override @Override
public ResponseDto<String> deleteTicket(String ticketsId, String performanceId) { public ResponseDto<String> deleteTicket(String ticketsId, String performanceId) {
try { try {
String merchantId = CurrentUtil.getCurrentUid();
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
if (!mongoMerchantUtils.judgeIsPermission(performanceId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId); KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId);
KylinTicketTimesVo ticketTimesData; KylinTicketTimesVo ticketTimesData;
KylinTicketVo ticketData = null; KylinTicketVo ticketData = null;
...@@ -298,13 +277,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -298,13 +277,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId, String ticketsId) { public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId, String ticketsId) {
try { try {
// 获取 当前时间 -> 创建时间 // 获取 当前时间 -> 创建时间
String merchantId = CurrentUtil.getCurrentUid();
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
if (!mongoMerchantUtils.judgeIsPermission(performanceId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
PerformancePartnerVo performancePartnerVo = mongoMerchantUtils.getPerformancePartnerVo(performanceId); PerformancePartnerVo performancePartnerVo = mongoMerchantUtils.getPerformancePartnerVo(performanceId);
if (performancePartnerVo.getAuditStatus() == 0 || performancePartnerVo.getAuditStatus() == 1) { if (performancePartnerVo.getAuditStatus() == 0 || performancePartnerVo.getAuditStatus() == 1) {
return ResponseDto.failure(ErrorMapping.get(20107)); return ResponseDto.failure(ErrorMapping.get(20107));
......
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