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

Skip to content

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

添加 merchant相关拦截

parent 478d0f52
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 55 deletions
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceRelations.java
View file @ 0b6d2418
......@@ -2,8 +2,10 @@ package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinPerformanceRelations implements Serializable ,Cloneable {
public class KylinPerformanceRelations implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
......@@ -75,6 +77,7 @@ public class KylinPerformanceRelations implements Serializable ,Cloneable {
private LocalDateTime updatedAt;
private static final KylinPerformanceRelations obj = new KylinPerformanceRelations();
public static KylinPerformanceRelations getNew() {
try {
return (KylinPerformanceRelations) obj.clone();
......@@ -82,4 +85,13 @@ public class KylinPerformanceRelations implements Serializable ,Cloneable {
return new KylinPerformanceRelations();
}
}
public Object[] insert(KylinPerformanceRelations vo) {
return new Object[]{
vo.getPerformanceRelationsId(), vo.getPerformanceId(),
vo.getCopyId()==null?"":vo.getCopyId(), vo.getMerchantId(),vo.getFieldId(),
vo.getRoadShowId(),vo.getProjectId(),"",
vo.getCreatedAt(),vo.getUpdatedAt()
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
View file @ 0b6d2418
......@@ -157,4 +157,14 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
return new KylinPerformanceStatus();
}
}
public Object[] insert(KylinPerformanceStatus vo){
return new Object[]{
vo.getPerformanceStatusId(),vo.getPerformanceId(),
vo.getIsShow(),vo.getStatus(),vo.getStatusSell(),
vo.getIsDistribution(),vo.getSyncAgent(),0,
vo.getAuditStatus(),vo.getIsTrueName(),vo.getLimitCount(),
vo.getLimitCountMember(),vo.getCreatedAt(),vo.getUpdatedAt()
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformances.java
View file @ 0b6d2418
......@@ -2,8 +2,10 @@ package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinPerformances implements Serializable ,Cloneable{
public class KylinPerformances implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
......@@ -165,6 +167,7 @@ public class KylinPerformances implements Serializable ,Cloneable{
private LocalDateTime updatedAt;
private static final KylinPerformances obj = new KylinPerformances();
public static KylinPerformances getNew() {
try {
return (KylinPerformances) obj.clone();
......@@ -172,4 +175,37 @@ public class KylinPerformances implements Serializable ,Cloneable{
return new KylinPerformances();
}
}
public Object[] insert(KylinPerformances vo) {
return new Object[]{
vo.getPerformancesId(),
vo.getTitle(),
vo.getType(),
vo.getImgPoster(),
// vo.getProvinceId(),
// vo.getProvinceName(),
vo.getCityId(),
vo.getCityName(),
// vo.getDistrictId(),
// vo.getDistrictName(),
vo.getApprovalUrl(),
vo.getNotice(),
vo.getSponsorId(),
vo.getSponsorType(),
vo.getSponsor(),
vo.getContacts(),
vo.getMobile(),
vo.getDescribes(),
vo.getDetails(),
vo.getNoticeImage(),
vo.getTimeStart(),
vo.getTimeEnd(),
// vo.getAuditTime(),
// vo.getRejectTxt(),
0,
vo.getComment(),
vo.getCreatedAt(),
vo.getUpdatedAt(),
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketRelations.java
View file @ 0b6d2418
......@@ -57,4 +57,11 @@ public class KylinTicketRelations implements Serializable ,Cloneable {
return new KylinTicketRelations();
}
}
public Object[] insert(KylinTicketRelations vo) {
return new Object[]{
vo.getTicketRelationsId(),vo.getTicketId(),vo.getTimesId(),
vo.getCreatedAt(),vo.getUpdatedAt()
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketStatus.java
View file @ 0b6d2418
......@@ -162,4 +162,18 @@ public class KylinTicketStatus implements Serializable ,Cloneable {
return new KylinTicketStatus();
}
}
public Object[] insert(KylinTicketStatus vo) {
return new Object[]{
vo.getTicketStatusId(),vo.getTicketId(),vo.getIsStudent(),
vo.getIsElectronic(),vo.getIsExpress(),vo.getStatus(),
vo.getCounts(),vo.getStatusExchange(),vo.getIsShowCode(),
vo.getQrCodeShowTime(),vo.getIsLackRegister(),vo.getTotalGeneral(),
vo.getTotalExchange(),vo.getSurplusGeneral(),vo.getSurplusExchange(),
vo.getExpressType(),vo.getIsTransfer(),vo.getIsTrueName(),vo.getLimitCount(),
vo.getMemberLimitCount(),vo.getIsExclusive(),vo.getIsMember(),
0,0,vo.getCreatedAt(),vo.getUpdatedAt()
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketTimeRelation.java
View file @ 0b6d2418
......@@ -2,8 +2,10 @@ package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinTicketTimeRelation implements Serializable ,Cloneable {
public class KylinTicketTimeRelation implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
......@@ -50,6 +52,7 @@ public class KylinTicketTimeRelation implements Serializable ,Cloneable {
private LocalDateTime updatedAt;
private static final KylinTicketTimeRelation obj = new KylinTicketTimeRelation();
public static KylinTicketTimeRelation getNew() {
try {
return (KylinTicketTimeRelation) obj.clone();
......@@ -57,4 +60,11 @@ public class KylinTicketTimeRelation implements Serializable ,Cloneable {
return new KylinTicketTimeRelation();
}
}
public Object[] insert(KylinTicketTimeRelation vo) {
return new Object[]{
vo.getTicketTimeRelationId(), vo.getTimesId(), vo.getPerformanceId(),
vo.getCreatedAt(), vo.getUpdatedAt()
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketTimes.java
View file @ 0b6d2418
......@@ -77,4 +77,12 @@ public class KylinTicketTimes implements Serializable ,Cloneable {
return new KylinTicketTimes();
}
}
public Object[] insert(KylinTicketTimes vo){
return new Object[]{
vo.getTicketTimesId(),vo.getTitle(),vo.getStatus(),
vo.getType(),vo.getUseStart(),vo.getUseEnd(),
vo.getComment(),vo.getCreatedAt(),vo.getUpdatedAt()
};
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTickets.java
View file @ 0b6d2418
......@@ -138,4 +138,17 @@ public class KylinTickets implements Serializable ,Cloneable{
return new KylinTickets();
}
}
public Object[] insert(KylinTickets vo) {
return new Object[]{
vo.getTicketsId(),vo.getTitle(),vo.getType(),
vo.getPrice(),vo.getPriceExpress(),vo.getPriceDiscountMember(),
vo.getPriceDiscount(),vo.getDescribes(),vo.getDescribeExpress(),
vo.getDescribeElectronic(),vo.getAdvanceMinuteMember(),
vo.getTimeStart(),vo.getTimeEnd(),vo.getTimeEndExpress(),
vo.getUseStart(),vo.getUseEnd(),vo.getPayCountdownMinute(),
vo.getSaleRemindMinute(),vo.getComment(),vo.getCreatedAt(),
vo.getUpdatedAt()
};
}
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @ 0b6d2418
......@@ -152,7 +152,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo.setProjectId(data.getProjectId());
mongoMerchantUtils.updatePerformancePartnerVoById(performancePartnerVo);
} else { // 无修改记录
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId,step1Param.getMerchantId());
performancePartnerVo.setIsTrueName(vo.getIsTrueName());
performancePartnerVo.setLimitCount(vo.getLimitCount());
performancePartnerVo.setStatusSell(vo.getStatusSell());
......@@ -175,7 +175,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (data == null) {
return ResponseDto.failure(ErrorMapping.get(20104));
}
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(data.getPerformancesId());
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(data.getPerformancesId(),merchantId);
if (null != vo) {
data.setStatus(vo.getAppStatus());
}
......@@ -189,7 +189,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
step2Param.setMerchantId(CurrentUtil.getCurrentUid());
// 无 performancesId 则 创建
if (!step2Param.getPerformancesId().isEmpty()) { // 获取 create 数据 status = 0 或 无数据 创建
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(step2Param.getPerformancesId());
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(step2Param.getPerformancesId(),step2Param.getMerchantId());
if (vo == null || vo.getAppStatus() == 0 || vo.getAppStatus() == 4) {
result = createStep2(step2Param);
log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result));
......@@ -341,7 +341,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
for (KylinTicketPartnerVo ticketItem : ticketList) {
//修改 redis库存
if (redisMerchantUtils.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId,merchantId);
KylinTicketTimesVo ticketTimesData = null;
KylinTicketVo ticketData = null;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
......@@ -412,7 +412,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
}
PerformanceStep2Param performanceStep2Param = PerformanceStep2Param.getNew();
BeanUtils.copyProperties(data, performanceStep2Param);
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performancesId,merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId,merchantId);
if (null != vo) {
performanceStep2Param.setStatus(vo.getAppStatus());
} else {
......@@ -434,7 +434,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performancesId,merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId,merchantId);
if (!(vo.getAppStatus() == 3 || vo.getAppStatus() == 7)) {
return ResponseDto.failure(ErrorMapping.get(20110));
}
......@@ -476,7 +476,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
public ResponseDto<String> outLinePerformance(String performancesId) {
try {
String merchantId = CurrentUtil.getCurrentUid();
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performancesId,merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId,merchantId);
if (vo.getAppStatus() >= 3 && vo.getAppStatus() != 4 && vo.getAppStatus() != 7) {//未提审||被拒绝 && performanceStatusData.getStatus() != 10
LocalDateTime updatedAt = LocalDateTime.now();
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_LINE.getKey(),
......@@ -594,7 +594,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
public ResponseDto<String> withdraw(String performancesId) {
try {
String merchantId = CurrentUtil.getCurrentUid();
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performancesId,merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId,merchantId);
if (vo != null && vo.getAuditStatus() == 0) {
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
performancePartnerVo.setPerformancesId(performancesId);
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinTicketTimesPartnerServiceImpl.java
View file @ 0b6d2418
......@@ -158,7 +158,7 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
if (data.getStatus() == 0) {
return ResponseDto.failure(ErrorMapping.get(20106));
}
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performanceId, merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId, merchantId);
KylinTicketTimesVo ticketTimesData = null;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
ticketTimesData = vo.getTicketTimeList().get(x);
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinTicketsPartnerServiceImpl.java
View file @ 0b6d2418
......@@ -232,7 +232,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
try {
String merchantId = CurrentUtil.getCurrentUid();
LocalDateTime updatedAt = LocalDateTime.now();
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performanceId, merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId, merchantId);
KylinTicketTimesVo ticketTimesData;
KylinTicketVo ticketData = null;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
......@@ -328,7 +328,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
try {
LocalDateTime updatedAt = LocalDateTime.now();
String merchantId = CurrentUtil.getCurrentUid();
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performancesId, merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId, merchantId);
KylinTicketTimesVo ticketTimesData;
KylinTicketVo ticketData = null;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
......@@ -372,7 +372,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
try {
LocalDateTime updatedAt = LocalDateTime.now();
String merchantId = CurrentUtil.getCurrentUid();
KylinPerformanceVo vo = mongoMerchantUtils.getPerformanceVo(performancesId, merchantId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId, merchantId);
KylinTicketTimesVo ticketTimesData;
KylinTicketVo ticketData = null;
for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/MongoMerchantUtils.java
View file @ 0b6d2418
......@@ -41,6 +41,10 @@ public class MongoMerchantUtils {
return mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId).and("merchantId").is(merchantId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
}
public PerformancePartnerVo getPerformancePartnerVoNoMerchant(String performanceId) {
return mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
}
public long getPerformancePartnerCount(Query query) {
return mongoTemplate.count(query, PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
}
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java
View file @ 0b6d2418
......@@ -169,7 +169,7 @@ public class PerformanceUtils {
*/
public KylinPerformanceMisVo getPerformanceMisVo(String performancesId) {
try {
PerformancePartnerVo performanceData = mongoMerchantUtils.getPerformancePartnerVo(performancesId);
PerformancePartnerVo performanceData = mongoMerchantUtils.getPerformancePartnerVoNoMerchant(performancesId);
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
......@@ -221,20 +221,20 @@ public class PerformanceUtils {
try {
LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("kylin_performances.del"));
sqls.add(SqlMapping.get("kylin_performance_status.del"));
sqls.add(SqlMapping.get("kylin_performance_relations.del"));
sqls.add(SqlMapping.get("kylin_performances.insert"));
sqls.add(SqlMapping.get("kylin_performance_status.del"));
sqls.add(SqlMapping.get("kylin_performance_status.insert"));
sqls.add(SqlMapping.get("kylin_performance_relations.del"));
sqls.add(SqlMapping.get("kylin_performance_relations.insert"));
sqls.add(SqlMapping.get("kylin_ticket_times.del"));
sqls.add(SqlMapping.get("kylin_ticket_time_relation.del"));
sqls.add(SqlMapping.get("kylin_ticket_times.insert"));
sqls.add(SqlMapping.get("kylin_ticket_time_relation.del"));
sqls.add(SqlMapping.get("kylin_ticket_time_relation.insert"));
sqls.add(SqlMapping.get("kylin_tickets.del"));
sqls.add(SqlMapping.get("kylin_ticket_status.del"));
sqls.add(SqlMapping.get("kylin_ticket_relations.del"));
sqls.add(SqlMapping.get("kylin_tickets.insert"));
sqls.add(SqlMapping.get("kylin_ticket_status.del"));
sqls.add(SqlMapping.get("kylin_ticket_status.insert"));
sqls.add(SqlMapping.get("kylin_ticket_relations.del"));
sqls.add(SqlMapping.get("kylin_ticket_relations.insert"));
LinkedList<Object[]> del1 = CollectionUtil.linkedListObjectArr();
......@@ -285,18 +285,11 @@ public class PerformanceUtils {
performanceRelations.setUpdatedAt(updatedAt);
del1.add(new Object[]{performances.getPerformancesId()});
Object[] obj_array1 = BeanUtil.convertBeanToMap(performances).values().toArray();
insert1.add(obj_array1);
log.debug("performance:"+obj_array1.toString());
insert1.add(performances.insert(performances));
del2.add(new Object[]{performances.getPerformancesId()});
Object[] obj_array2 = BeanUtil.convertBeanToMap(performanceStatus).values().toArray();
insert2.add(obj_array2);
log.debug("performanceStatus:"+obj_array2.toString());
insert2.add(performanceStatus.insert(performanceStatus));
del3.add(new Object[]{performances.getPerformancesId()});
Object[] obj_array3 = BeanUtil.convertBeanToMap(performanceRelations).values().toArray();
insert3.add(obj_array3);
insert3.add(performanceRelations.insert(performanceRelations));
//场次数据
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
......@@ -319,12 +312,9 @@ public class PerformanceUtils {
ticketTimeRelation.setUpdatedAt(updatedAt);
del4.add(new Object[]{ticketTimes.getTicketTimesId()});
Object[] obj_array4 = BeanUtil.convertBeanToMap(ticketTimes).values().toArray();
insert4.add(obj_array4);
insert4.add(ticketTimes.insert(ticketTimes));
del5.add(new Object[]{ticketTimes.getTicketTimesId()});
Object[] obj_array5 = BeanUtil.convertBeanToMap(ticketTimeRelation).values().toArray();
insert5.add(obj_array5);
insert5.add(ticketTimeRelation.insert(ticketTimeRelation));
//修改票
for (KylinTicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
......@@ -347,16 +337,22 @@ public class PerformanceUtils {
if (ticketItem.getIsExpress() == 1) {
tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
tickets.setDescribeExpress(ticketItem.getDescribeExpress());
}else{
tickets.setTimeEndExpress(updatedAt);
tickets.setDescribeExpress("");
}
if (ticketItem.getIsElectronic() == 1) {
tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
}else{
tickets.setDescribeElectronic("");
}
tickets.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart())));
tickets.setUseEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseEnd())));
tickets.setSaleRemindMinute(60);
tickets.setAdvanceMinuteMember(5);
tickets.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getCreatedAt())));
tickets.setUpdatedAt(updatedAt);
ticketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
ticketStatus.setTicketStatusId(IDGenerator.nextSnowId());
ticketStatus.setTicketId(tickets.getTicketsId());
ticketStatus.setIsMember(1);
ticketStatus.setIsExclusive(0);
......@@ -365,6 +361,8 @@ public class PerformanceUtils {
ticketStatus.setStatusExchange(7);
if (ticketItem.getIsShowCode() == 1) {
ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime())));
}else{
ticketStatus.setQrCodeShowTime(updatedAt);
}
ticketRelations.setCreatedAt(tickets.getCreatedAt());
......@@ -375,24 +373,26 @@ public class PerformanceUtils {
ticketRelations.setUpdatedAt(updatedAt);
del6.add(new Object[]{tickets.getTicketsId()});
Object[] obj_array6 = BeanUtil.convertBeanToMap(tickets).values().toArray();
insert6.add(obj_array6);
insert6.add(tickets.insert(tickets));
del7.add(new Object[]{tickets.getTicketsId()});
Object[] obj_array7 = BeanUtil.convertBeanToMap(ticketStatus).values().toArray();
insert7.add(obj_array7);
insert7.add(ticketStatus.insert(ticketStatus));
del8.add(new Object[]{tickets.getTicketsId()});
Object[] obj_array8 = BeanUtil.convertBeanToMap(ticketRelations).values().toArray();
insert8.add(obj_array8);
insert8.add(ticketRelations.insert(ticketRelations));
redisMerchantUtils.setSurplusExchange(tickets.getTicketsId(), ticketStatus.getSurplusExchange());
redisMerchantUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
}
}
String sqlData = SqlMapping.gets(sqls,
del1, del2, del3, del4, del5, del6, del7, del8,
insert1, insert2, insert3, insert4, insert5, insert6, insert7, insert8);
del1, insert1,
del2, insert2,
del3, insert3,
del4, insert4,
del5, insert5,
del6, insert6,
del7, insert7,
del8, insert8
);
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_INSERT.getKey(),
sqlData);
} catch (Exception e) {
......@@ -486,7 +486,7 @@ public class PerformanceUtils {
public KylinPerformanceVo combinePerformanceVoData(String performancesId) {
try {
//演出数据
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performancesId);
KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVoNoMerchant(performancesId);
//场地相关数据
KylinFields fields = new KylinFields();
MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(vo.getFieldId());
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/RedisMerchantUtils.java
View file @ 0b6d2418
......@@ -52,12 +52,23 @@ public class RedisMerchantUtils {
* @param performanceId
* @return
*/
public KylinPerformanceVo getPerformanceVo(String performanceId) {
public KylinPerformanceVo getPerformanceVo(String performanceId,String merchantId) {
Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
if (obj != null) {
return (KylinPerformanceVo) obj;
} else {
KylinPerformanceVo performanceData = mongoMerchantUtils.getPerformanceVo(performanceId);
KylinPerformanceVo performanceData = mongoMerchantUtils.getPerformanceVo(performanceId,merchantId);
redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
return performanceData;
}
}
public KylinPerformanceVo getPerformanceVoNoMerchant(String performanceId) {
Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
if (obj != null) {
return (KylinPerformanceVo) obj;
} else {
KylinPerformanceVo performanceData = mongoMerchantUtils.getPerformanceVoNoMerchant(performanceId);
redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
return performanceData;
}
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties
View file @ 0b6d2418
......@@ -35,21 +35,21 @@ kylin_performance_status.VoStatus=UPDATE kylin_performance_status SET status = ?
kylin_performances.del=DELETE FROM kylin_performances WHERE performances_id = ?
kylin_performance_status.del=DELETE FROM kylin_performance_status WHERE performance_id = ?
kylin_performance_relations.del=DELETE FROM kylin_performance_relations WHERE performance_id = ?
kylin_performances.insert=INSERT INTO kylin_performances (performances_id,title,type,imgPoster,province_id,province_name,city_id,city_name,district_id,district_name,approval_url,notice,sponsor_id,sponsor_type,sponsor,contacts,mobile,describes,details,notice_image,time_start,time_end,audit_time,reject_txt,sort,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,limit_count_member,is_recommend,is_can_refund,is_open_refund_present,refund_open_time,refund_close_time,is_transfer,transfer_start_time,transfer_end_time,is_refund_poundage,is_refund_voucher,is_refund_express,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
#province_id,province_name,district_id,district_name
kylin_performances.insert=INSERT INTO kylin_performances (performances_id,title,type,img_poster,city_id,city_name,approval_url,notice,sponsor_id,sponsor_type,sponsor,contacts,mobile,describes,details,notice_image,time_start,time_end,sort,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,limit_count_member,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_performance_relations.insert=INSERT INTO kylin_performance_relations (performance_relations_id,performance_id,copy_id,merchant_id,field_id,road_show_id,project_id,video_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
kylin_ticket_times.del=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?
kylin_ticket_time_relation.del=DELETE FROM kylin_ticket_time_relation WHERE times_id = ?
kylin_ticket_times.insert=INSERT INTO kylin_ticket_times (ticket_times_id,title,status,type,use_start,use_end,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?)
kylin_ticket_time_relation.insert=INSERT INTO kylin_ticket_time_realtion (ticket_time_relation_id,times_id,performance_id,created_at,updated_at) VALUES (?,?,?,?,?)
kylin_ticket_time_relation.insert=INSERT INTO kylin_ticket_time_relation (ticket_time_relation_id,times_id,performance_id,created_at,updated_at) VALUES (?,?,?,?,?)
kylin_tickets.del=DELETE FROM kylin_tickets WHERE tickets_id = ?
kylin_ticket_status.del=DELETE FROM kylin_ticket_status WHERE ticket_id = ?
kylin_ticket_relations.del=DELETE FROM kylin_ticket_relations WHERE ticket_id = ?
kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,prcie,price_express,price_discount_member,price_discount,describes,describe_express,describe_electronic,advance_minute_member,time_start,time_end,time_end_express,use_start,use_end,pay_countdown_minute,sale_remind_minute,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,price,price_express,price_discount_member,price_discount,describes,describe_express,describe_electronic,advance_minute_member,time_start,time_end,time_end_express,use_start,use_end,pay_countdown_minute,sale_remind_minute,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_ticket_status.insert=INSERT INTO kylin_ticket_status (ticket_status_id,ticket_id,is_student,is_electronic,is_express,status,counts,status_exchange,is_show_code,qr_code_show_time,is_lack_register,total_general,total_exchange,surplus_general,surplus_exchange,express_type,is_transfer,is_true_name,limit_count,member_limit_count,is_exclusive,is_member,is_agent,sync_damai,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_ticket_relations.insert=INSERT INTO kylin_ticket_relations (ticket_relations_id,ticket_id,times_id,created_at,updated_at) VALUES (?,?,?,?,?)
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