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

Skip to content

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

修改 不需要审核的字段提交审核后未生效的bug

parent 0f10db68
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 17 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketVo.java
View file @ a45f4720
package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTicketStatus;
import com.liquidnet.service.kylin.entity.KylinTickets;
......@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
......@@ -16,7 +18,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Data
@ApiModel
public class KylinTicketVo {
public class KylinTicketVo implements Serializable,Cloneable{
private Integer mid;
@ApiModelProperty(value = "主键")
......@@ -193,4 +195,12 @@ public class KylinTicketVo {
this.totalExchange = ticketStatus.getTotalExchange();
}
private static final KylinTicketVo obj = new KylinTicketVo();
public static KylinTicketVo getNew() {
try {
return (KylinTicketVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketVo();
}
}
}
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @ a45f4720
......@@ -186,7 +186,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
return ResponseDto.failure(ErrorMapping.get(20104));
}
if (!mongoSlimeUtils.judgeIsPermission(performancesId, merchantId, new String[]{
SlimeAuthorizationConst.PerformancePermission.EDIT.getId(),SlimeAuthorizationConst.PerformancePermission.READ.getId(),
SlimeAuthorizationConst.PerformancePermission.EDIT.getId(), SlimeAuthorizationConst.PerformancePermission.READ.getId(),
})) {
List<String> fieldsIdList = slimeRdmService.getFieldAppliesVosByUid(merchantId).stream().map(SlimeFieldAppliesVo::getFieldId).collect(Collectors.toList());
if (!(data.getMerchantId().equals(merchantId) || fieldsIdList.contains(data.getFieldId()))) {
......@@ -318,8 +318,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("kylin_performance.updateStep2"));
sqls.add(SqlMapping.get("kylin_performance_status.updateStep2"));
sqls.add(SqlMapping.get("kylin_ticket.updateStep2"));
sqls.add(SqlMapping.get("kylin_ticket_status.updateStep2"));
sqls.add(SqlMapping.get("kylin_ticket_express_module.del"));
sqls.add(SqlMapping.get("kylin_ticket_express_module.insert"));
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
......@@ -329,11 +331,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
LinkedList<Object[]> sqlsDataE = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataF = CollectionUtil.linkedListObjectArr();
LocalDateTime now = LocalDateTime.now();
// 获取 当前时间 -> 创建时间
boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId);
if (isExistsSubmit) {
return ResponseDto.failure(ErrorMapping.get(20112));
}
// // 获取 当前时间 -> 创建时间
// boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId);
// if (isExistsSubmit) {
// return ResponseDto.failure(ErrorMapping.get(20112));
// }
//演出修改数据
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
performancePartnerVo.setPerformancesId(performanceId);
......@@ -350,7 +352,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
// if (fieldsVo.getClaimStatus() == 1) {
// performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck());
// } else {
performancePartnerVo.setFieldAuditStatus(0);
performancePartnerVo.setFieldAuditStatus(0);
// }
// }
......@@ -364,13 +366,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setStatus(9);
}
mongoSlimeUtils.updatePerformancePartnerVoById(performancePartnerVo);
KylinPerformanceVo kylinPerformanceVo = KylinPerformanceVo.getNew();
kylinPerformanceVo.setPerformancesId(performancePartnerVo.getPerformancesId());
kylinPerformanceVo.setAuditStatus(performancePartnerVo.getAuditStatus());
kylinPerformanceVo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
kylinPerformanceVo.setType(redisSlimeUtils.getPerformanceVo(kylinPerformanceVo.getPerformancesId()).getType());
mongoSlimeUtils.updateKylinPerformanceVoById(kylinPerformanceVo);
redisSlimeUtils.delPerformanceVo(kylinPerformanceVo.getPerformancesId());
//提交 票
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) {
......@@ -394,6 +389,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
});
redisSlimeUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(performanceId);
//提示：票种价格、售票时间、票种购票限制 直接生效 (演出购票限制，购票须知 演出是否实名 票种缺货登记 票种是否电子票 票种是否快递票 票种最低购买张数 票种是否显示二维码)
List<TicketTimesTicketCreatePartnerVo> timeList = kylinPerformanceMisVo.getTicketTimes();
for (TicketTimesTicketCreatePartnerVo timesItem : timeList) {
......@@ -401,7 +397,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
for (KylinTicketPartnerVo ticketItem : ticketList) {
//修改 redis库存
if (redisSlimeUtils.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(performanceId);
KylinTicketVo ticketData = null;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
KylinTicketTimesVo ticketTimesData = vo.getTicketTimeList().get(x);
......@@ -419,6 +414,23 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
int changeExchange = ticketItem.getTotalExchange() - ticketData.getTotalExchange();
redisSlimeUtils.changeSurplusGeneral(ticketItem.getTicketsId(), changeGeneral);
redisSlimeUtils.changeSurplusExchange(ticketItem.getTicketsId(), changeExchange);
ticketData.setTimeEnd(ticketItem.getTimeEnd());
ticketData.setTimeStart(ticketItem.getTimeStart());
ticketData.setTimeEndExpress(ticketItem.getTimeEndExpress());
ticketData.setPrice(ticketItem.getPrice());
ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes( kylinPerformanceMisVo.getPayCountdownMinute())));
ticketData.setTotalExchange(ticketItem.getTotalExchange());
ticketData.setTotalGeneral(ticketItem.getTotalGeneral());
ticketData.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
ticketData.setLimitCount( ticketItem.getLimitCount());
ticketData.setIsLackRegister(ticketItem.getIsLackRegister());
ticketData.setIsExpress(ticketItem.getIsExpress());
ticketData.setIsElectronic(ticketItem.getIsElectronic());
ticketData.setCounts(ticketItem.getCounts());
ticketData.setIsShowCode(ticketItem.getIsShowCode());
ticketData.setQrCodeShowTime(ticketItem.getQrCodeShowTime());
}
//修改 mysql 售卖时间
......@@ -434,6 +446,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
ticketItem.getIsElectronic(), ticketItem.getCounts(), ticketItem.getIsShowCode(),
DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getQrCodeShowTime()), ticketItem.getTicketsId(), now, now
});
//快递相关
KylinTicketExpressModuleVo moduleVo = redisSlimeUtils.getTEMMerchantVo(ticketItem.getTicketsId());
if (moduleVo != null) {
......@@ -446,6 +459,21 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
}
}
}
//修改vo
vo.setPerformancesId(performancePartnerVo.getPerformancesId());
vo.setAuditStatus(performancePartnerVo.getAuditStatus());
vo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
vo.setType(vo.getType());
vo.setNoticeImage(kylinPerformanceMisVo.getNoticeImage());
vo.setFieldAuditStatus(performancePartnerVo.getFieldAuditStatus());
vo.setAuditStatus(performancePartnerVo.getAuditStatus());
vo.setIsTrueName(step2Param.getIsTrueName());
vo.setLimitCount(step2Param.getLimitCount());
mongoSlimeUtils.updateKylinPerformanceVoById(vo);
redisSlimeUtils.delPerformanceVo(performanceId);
String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE, sqlsDataF);
queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_STEP2.getKey(),
sqlData);
......@@ -474,7 +502,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
return ResponseDto.failure(ErrorMapping.get(20104));
}
if (!mongoSlimeUtils.judgeIsPermission(performancesId, merchantId, new String[]{
SlimeAuthorizationConst.PerformancePermission.EDIT.getId(),SlimeAuthorizationConst.PerformancePermission.READ.getId(),
SlimeAuthorizationConst.PerformancePermission.EDIT.getId(), SlimeAuthorizationConst.PerformancePermission.READ.getId(),
})) {
List<String> fieldsIdList = slimeRdmService.getFieldAppliesVosByUid(merchantId).stream().map(SlimeFieldAppliesVo::getFieldId).collect(Collectors.toList());
if (!(data.getMerchantId().equals(merchantId) || fieldsIdList.contains(data.getFieldId()))) {
......
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