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

Commit 6b8c05a1 authored by 胡佳晨's avatar 胡佳晨

partner 添加 日志

parent 05b28e0e
...@@ -44,4 +44,15 @@ public class UserPathDto implements Serializable { ...@@ -44,4 +44,15 @@ public class UserPathDto implements Serializable {
instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent"); instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
return "MDSKY.NOW.ELK." + ( instance.uid.equals("UID") ? CurrentUtil.getCliIpAddr() : instance.uid )+ " = " + JsonUtils.toJson(instance); return "MDSKY.NOW.ELK." + ( instance.uid.equals("UID") ? CurrentUtil.getCliIpAddr() : instance.uid )+ " = " + JsonUtils.toJson(instance);
} }
public static String setPartnerData(String merchantId ,String interfaceName, Object params, Object result) {
instance.ip = CurrentUtil.getCliIpAddr();
instance.uid = merchantId;
instance.time = DateUtil.Formatter.yyyyMMddHHmmssSSSUnTrim.format(LocalDateTime.now());
instance.interfaceName = interfaceName;
instance.params = params.toString().equals("") ? "NanParams" : params.toString();
instance.result = result.toString().equals("") ? "NanResults" : result.toString();
instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
return "MDSKY.NOW.PDK." + instance.uid+ " = " + JsonUtils.toJson(instance);
}
} }
...@@ -11,6 +11,7 @@ import com.liquidnet.commons.lang.util.DateUtil; ...@@ -11,6 +11,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
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;
import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao; import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao; import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
...@@ -112,8 +113,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -112,8 +113,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if (createParam == null) { if (createParam == null) {
result = createStep1(step1Param); result = createStep1(step1Param);
log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"createStep1", step1Param,result));
} else {// 修改 } else {// 修改
result = updateStep1(step1Param); result = updateStep1(step1Param);
log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"updateStep1", step1Param,result));
} }
} }
return result; return result;
...@@ -217,6 +220,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -217,6 +220,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if (null != performanceStatus) { if (null != performanceStatus) {
data.setStatus(performanceStatus.getStatus()); data.setStatus(performanceStatus.getStatus());
} }
log.info(UserPathDto.setPartnerData("0","getStep1", "performancesId="+performancesId,data));
return ResponseDto.success(data); return ResponseDto.success(data);
} }
...@@ -229,8 +233,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -229,8 +233,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, step2Param.getPerformancesId())); KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, step2Param.getPerformancesId()));
if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) { if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
result = createStep2(step2Param); result = createStep2(step2Param);
log.info(UserPathDto.setPartnerData("0","createStep2", step2Param,result));
} else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9) {// 修改 } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9) {// 修改
result = updateStep2(step2Param); result = updateStep2(step2Param);
log.info(UserPathDto.setPartnerData("0","updateStep2(step2Param", step2Param,result));
} else if (performanceStatus.getStatus() == 10) { } else if (performanceStatus.getStatus() == 10) {
result = ResponseDto.failure("演出已结束不可修改"); result = ResponseDto.failure("演出已结束不可修改");
} }
...@@ -472,6 +478,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -472,6 +478,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} }
performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList); performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
log.info(UserPathDto.setPartnerData("0","getStep2", "performancesId="+performancesId,performanceStep2Param));
return ResponseDto.success(performanceStep2Param); return ResponseDto.success(performanceStep2Param);
} }
...@@ -518,6 +525,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -518,6 +525,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} }
// 判断状态 // 判断状态
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","onLinePerformance", "performancesId="+performancesId,"上线成功"));
return ResponseDto.success("上线成功"); return ResponseDto.success("上线成功");
} catch (Exception e) { } catch (Exception e) {
log.debug("上线失败", e); log.debug("上线失败", e);
...@@ -539,6 +547,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -539,6 +547,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId)); , Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","outLinePerformance", "performancesId="+performancesId,"下线成功"));
return ResponseDto.success("下线成功"); return ResponseDto.success("下线成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20111)); return ResponseDto.failure(ErrorMapping.get(20111));
...@@ -577,6 +586,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -577,6 +586,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
mongoTemplate.insert(ticketItem, KylinTicketPartnerVo.class.getSimpleName()); mongoTemplate.insert(ticketItem, KylinTicketPartnerVo.class.getSimpleName());
} }
} }
log.info(UserPathDto.setPartnerData("0","copyPerformance", "performancesId="+performancesId,performancePartnerVo.getPerformancesId()));
return performancePartnerVo.getPerformancesId(); return performancePartnerVo.getPerformancesId();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -640,7 +650,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -640,7 +650,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override @Override
public ResponseDto<String> withdraw(String performancesId) { public ResponseDto<String> withdraw(String performancesId) {
try { try {
//mysql auditStatus
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId)); KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (performanceStatus != null && performanceStatus.getAuditStatus() == 0) { if (performanceStatus != null && performanceStatus.getAuditStatus() == 0) {
KylinPerformanceStatus data1 = KylinPerformanceStatus.getNew(); KylinPerformanceStatus data1 = KylinPerformanceStatus.getNew();
...@@ -665,6 +674,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -665,6 +674,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(), Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
object object
); );
log.info(UserPathDto.setPartnerData("0","withdraw", "performancesId="+performancesId,"撤回成功"));
return ResponseDto.success("撤回成功"); return ResponseDto.success("撤回成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20116)); return ResponseDto.failure(ErrorMapping.get(20116));
......
...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator; ...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam; import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.KylinPerformanceStatus; import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
...@@ -68,12 +69,15 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -68,12 +69,15 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId())); Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(UserPathDto.setPartnerData("0","createTimes", createTicketTimesParam,ticketTimesPartnerVo));
} else if(performanceStatus.getAuditStatus()==0){ } else if(performanceStatus.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20101)); return ResponseDto.failure(ErrorMapping.get(20101));
}else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出 }else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketTimesPartnerVo = addNewTimes(createTicketTimesParam); ticketTimesPartnerVo = addNewTimes(createTicketTimesParam);
log.info(UserPathDto.setPartnerData("0","addNewTimes", createTicketTimesParam,ticketTimesPartnerVo));
} else { } else {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(UserPathDto.setPartnerData("0","createTimes", createTicketTimesParam,ticketTimesPartnerVo));
} }
return ticketTimesPartnerVo; return ticketTimesPartnerVo;
} }
...@@ -189,6 +193,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -189,6 +193,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(), Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(),
object object
); );
log.info(UserPathDto.setPartnerData("0","deleteTimes", "ticketTimesId="+ticketTimesId,"删除成功"));
return ResponseDto.success("删除成功"); return ResponseDto.success("删除成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20106)); return ResponseDto.failure(ErrorMapping.get(20106));
...@@ -229,6 +234,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -229,6 +234,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
object, object,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER) new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
); );
log.info(UserPathDto.setPartnerData("0","changeTimes", createTicketTimesParam,JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class)));
return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class)); return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class));
} catch (Exception e) { } catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20103)); return ResponseDto.failure(ErrorMapping.get(20103));
......
...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator; ...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo; import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.TicketCreateParam; import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
...@@ -20,6 +21,7 @@ import com.liquidnet.service.platform.utils.PerformanceVoTask; ...@@ -20,6 +21,7 @@ import com.liquidnet.service.platform.utils.PerformanceVoTask;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument; import com.mongodb.client.model.ReturnDocument;
import io.github.classgraph.json.JSONUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -79,13 +81,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -79,13 +81,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, timesPartnerVo.getPerformancesId())); Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, timesPartnerVo.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,ticketPartnerVo));
} else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出 } else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketPartnerVo = addNewTicket(ticketCreateParam); ticketPartnerVo = addNewTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","addNewTicket", ticketCreateParam,ticketPartnerVo));
} else { } else {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,ticketPartnerVo));
} }
} else { } else {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,ticketPartnerVo));
} }
return ticketPartnerVo; return ticketPartnerVo;
} }
...@@ -240,6 +246,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -240,6 +246,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
); );
KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class); KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class);
log.info(UserPathDto.setPartnerData("0","updateTicket", ticketCreateParam,kylinTicketPartnerVoData));
return ResponseDto.success(kylinTicketPartnerVoData); return ResponseDto.success(kylinTicketPartnerVoData);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -281,6 +288,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -281,6 +288,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
object object
); );
log.info(UserPathDto.setPartnerData("0","deleteTicket", "ticketsId="+ticketsId,"删除成功"));
return ResponseDto.success("删除成功"); return ResponseDto.success("删除成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20106)); return ResponseDto.failure(ErrorMapping.get(20106));
...@@ -309,6 +317,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -309,6 +317,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
KylinTicketPartnerVo data = mongoTemplate.insert( KylinTicketPartnerVo data = mongoTemplate.insert(
kylinTicketPartnerVo, KylinTicketPartnerVo.class.getSimpleName() kylinTicketPartnerVo, KylinTicketPartnerVo.class.getSimpleName()
); );
log.info(UserPathDto.setPartnerData("0","deleteTicket", "performanceId="+performanceId+",ticketsId="+ticketsId,kylinTicketPartnerVo));
return ResponseDto.success(kylinTicketPartnerVo); return ResponseDto.success(kylinTicketPartnerVo);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -373,6 +382,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -373,6 +382,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
); );
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","onLine", "performancesId="+performancesId+",ticketsId="+ticketsId,"上线成功"));
return ResponseDto.success("上线成功"); return ResponseDto.success("上线成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20110)); return ResponseDto.failure(ErrorMapping.get(20110));
...@@ -404,6 +414,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -404,6 +414,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
); );
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","outLine", "performancesId="+performancesId+",ticketsId="+ticketsId,"下线成功"));
return ResponseDto.success("下线成功"); return ResponseDto.success("下线成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20111)); return ResponseDto.failure(ErrorMapping.get(20111));
......
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