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

Commit 374f2719 authored by 胡佳晨's avatar 胡佳晨

提交代码 目前修复 创建演出 admin列表是查看的bug

待修复 第一次修改演出自动上线的bug
parent 46d3ae78
...@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; ...@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.*; import com.liquidnet.service.kylin.dto.vo.ticketSystem.*;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo; import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
...@@ -32,8 +33,8 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS; ...@@ -32,8 +33,8 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Service @Service
public class InnerService { public class InnerService {
// @Value("${liquidnet.service.platform.url}") @Value("${liquidnet.service.platform.url}")
private String platform = "http://127.0.0.1:9003"; private String platform ;
@Autowired @Autowired
RedisDataSourceUtil redisDataSourceUtil; RedisDataSourceUtil redisDataSourceUtil;
@Autowired @Autowired
......
...@@ -236,10 +236,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -236,10 +236,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
// 获取 当前时间 -> 创建时间 // 获取 当前时间 -> 创建时间
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
// String merchantId = step2Param.getMerchantId(); // String merchantId = step2Param.getMerchantId();
boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId); // boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId);
if (isExistsSubmit) { // if (isExistsSubmit) {
return ResponseDto.failure(ErrorMapping.get(20112)); // return ResponseDto.failure(ErrorMapping.get(20112));
} // }
//演出修改数据 //演出修改数据
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew(); PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
...@@ -270,6 +270,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -270,6 +270,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setIsCreateSave(0); performancePartnerVo.setIsCreateSave(0);
performancePartnerVo.setAuditStatus(0); performancePartnerVo.setAuditStatus(0);
mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo); mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo);
kylinPerformanceMisVo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
//提交 票 //提交 票
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId); List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) { for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) {
...@@ -313,7 +314,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -313,7 +314,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
public ResponseDto<String> updateStep2(PerformanceStep2Param step2Param) { public ResponseDto<String> updateStep2(PerformanceStep2Param step2Param) {
try { try {
// 获取 主键id // 获取 主键id
String merchantId = step2Param.getMerchantId();
String performanceId = step2Param.getPerformancesId(); String performanceId = step2Param.getPerformancesId();
LinkedList<String> sqls = CollectionUtil.linkedListString(); LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("kylin_performance.updateStep2")); sqls.add(SqlMapping.get("kylin_performance.updateStep2"));
...@@ -330,10 +330,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -330,10 +330,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
LinkedList<Object[]> sqlsDataF = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlsDataF = CollectionUtil.linkedListObjectArr();
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
// 获取 当前时间 -> 创建时间 // 获取 当前时间 -> 创建时间
boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId); // boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId);
if (isExistsSubmit) { // if (isExistsSubmit) {
return ResponseDto.failure(ErrorMapping.get(20112)); // return ResponseDto.failure(ErrorMapping.get(20112));
} // }
//演出修改数据 //演出修改数据
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew(); PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
performancePartnerVo.setPerformancesId(performanceId); performancePartnerVo.setPerformancesId(performanceId);
...@@ -350,7 +350,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -350,7 +350,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
// if (fieldsVo.getClaimStatus() == 1) { // if (fieldsVo.getClaimStatus() == 1) {
// performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck()); // performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck());
// } else { // } else {
// performancePartnerVo.setFieldAuditStatus(0); performancePartnerVo.setFieldAuditStatus(0);
// } // }
// } // }
...@@ -364,6 +364,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -364,6 +364,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setStatus(9); performancePartnerVo.setStatus(9);
} }
mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo); mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo);
KylinPerformanceVo kylinPerformanceVo = KylinPerformanceVo.getNew();
kylinPerformanceVo.setPerformancesId(performancePartnerVo.getPerformancesId());
kylinPerformanceVo.setAuditStatus(performancePartnerVo.getAuditStatus());
kylinPerformanceVo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
mongoSlimeUtils.updateKylinPerformanceVoById(kylinPerformanceVo);
//提交 票 //提交 票
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId); List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) { for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) {
...@@ -840,7 +845,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -840,7 +845,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
changeVo.setFieldAuditStatus(status); changeVo.setFieldAuditStatus(status);
changeVo.setRejectTxt(rejectTxt); changeVo.setRejectTxt(rejectTxt);
changeVo.setPerformancesId(performancesId); changeVo.setPerformancesId(performancesId);
if(status==2) { if (status == 2) {
changeVo.setAuditStatus(status); changeVo.setAuditStatus(status);
} }
mongoSlimeUtils.updateKylinPerformanceVoById(changeVo); mongoSlimeUtils.updateKylinPerformanceVoById(changeVo);
...@@ -850,13 +855,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -850,13 +855,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
changePartnerVo.setFieldAuditStatus(status); changePartnerVo.setFieldAuditStatus(status);
changePartnerVo.setRejectTxt(rejectTxt); changePartnerVo.setRejectTxt(rejectTxt);
changePartnerVo.setUpdatedAt(now.format(DateUtil.DTF_YMD_HMS)); changePartnerVo.setUpdatedAt(now.format(DateUtil.DTF_YMD_HMS));
if(status==2) { if (status == 2) {
changePartnerVo.setAuditStatus(status); changePartnerVo.setAuditStatus(status);
} }
mongoSlimeUtils.updatePerformancePartnerVoById(changePartnerVo); mongoSlimeUtils.updatePerformancePartnerVoById(changePartnerVo);
queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_PERFORMANCE_UPDATE.getKey(), queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_PERFORMANCE_UPDATE.getKey(),
SqlMapping.get("kylin_performance_status.fieldsStatus", SqlMapping.get("kylin_performance_status.fieldsStatus",
status, status,rejectTxt, performancesId, now, now status, status, rejectTxt, performancesId, now, now
)); ));
} }
return ResponseDto.success("审核完成"); return ResponseDto.success("审核完成");
......
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