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

Skip to content

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

提交 提审演出的时候初始化vo

parent b3164e8e
Show whitespace changes
Inline Side-by-side
Showing with 237 additions and 12 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketTimesVo.java
View file @ afc76bec
package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -31,12 +32,20 @@ public class KylinTicketTimesVo {
@ApiModelProperty(value = "票种")
private List<KylinTicketVo> ticketList;
public void setTicketTimes(KylinTicketTimes ticketTimes){
this.mid=ticketTimes.getMid();
this.ticketTimesId=ticketTimes.getTicketTimesId();
this.title=ticketTimes.getTitle();
this.type=ticketTimes.getType();
this.useStart= DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseStart());
this.useEnd=DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseEnd());
public void setTicketTimes(KylinTicketTimes ticketTimes) {
this.mid = ticketTimes.getMid();
this.ticketTimesId = ticketTimes.getTicketTimesId();
this.title = ticketTimes.getTitle();
this.type = ticketTimes.getType();
this.useStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseStart());
this.useEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseEnd());
}
public void setTicketTimes(KylinTicketTimesPartnerVo ticketTimes) {
this.ticketTimesId = ticketTimes.getTicketTimesId();
this.title = ticketTimes.getTitle();
this.type = ticketTimes.getType();
this.useStart = ticketTimes.getUseStart();
this.useEnd = ticketTimes.getUseEnd();
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketVo.java
View file @ afc76bec
package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTicketStatus;
import com.liquidnet.service.kylin.entity.KylinTickets;
import io.swagger.annotations.ApiModel;
......@@ -8,8 +9,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Data
@ApiModel
public class KylinTicketVo {
......@@ -142,4 +146,51 @@ public class KylinTicketVo {
this.totalExchange = ticketStatus.getTotalExchange();
}
public void setTicket(KylinTicketPartnerVo ticket) {
this.ticketsId = ticket.getTicketsId();
this.title = ticket.getTitle();
this.type = ticket.getType();
this.price = ticket.getPrice();
this.priceExpress = BigDecimal.valueOf(-1);
this.memberPrice = ticket.getPrice().subtract(BigDecimal.ZERO);
this.discountPrice = ticket.getPrice().subtract(BigDecimal.ZERO);
this.describes = ticket.getDescribes();
this.describeExpress = ticket.getDescribeExpress();
this.describeElectronic = ticket.getDescribeElectronic();
this.timeStart = ticket.getTimeStart();
this.timeEnd = ticket.getTimeEnd();
this.advanceMinuteMember = 5;
this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.parse(ticket.getTimeStart(),DTF_YMD_HMS).plusMinutes(-5));
if (ticket.getTimeEndExpress() != null) {
this.timeEndExpress = ticket.getTimeEndExpress();
} else {
this.timeEndExpress = null;
}
this.useStart = ticket.getUseStart();
this.useEnd = ticket.getUseEnd();
this.saleRemindMinute = 60;
}
public void setTicketStatus(KylinTicketPartnerVo ticketStatus,int isTrueName) {
this.isMember = ticketStatus.getIsMember();
this.isAgent = 0;
this.isExclusive = ticketStatus.getIsExclusive();
this.isTrueName = isTrueName;
this.expressType = ticketStatus.getExpressType();
this.isLackRegister = ticketStatus.getIsLackRegister();
this.statusExchange = 6;
this.status = ticketStatus.getStatus();
this.isElectronic = ticketStatus.getIsElectronic();
this.isExpress = ticketStatus.getIsExpress();
this.isStudent = ticketStatus.getIsStudent();
this.limitCountMember = 1;
this.limitCount = ticketStatus.getLimitCount();
this.counts = ticketStatus.getCounts();
this.sysDamai = 0;
this.isShowCode = ticketStatus.getIsShowCode();
this.qrCodeShowTime = ticketStatus.getQrCodeShowTime();
this.totalGeneral = ticketStatus.getTotalGeneral();
this.totalExchange = ticketStatus.getTotalExchange();
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @ afc76bec
package com.liquidnet.service.kylin.dto.vo.mongo;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.entity.KylinFields;
import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
......@@ -148,6 +149,26 @@ public class KylinPerformanceVo {
}
}
public void setPerformance(PerformancePartnerVo performance) {
this.performancesId = performance.getPerformancesId();
this.title = performance.getTitle();
this.imgPoster = performance.getImgPoster();
this.timeStart = performance.getTimeStart();
this.timeEnd = performance.getTimeEnd();
this.createdAt = performance.getCreatedAt();
this.type = performance.getType();
this.details = performance.getDetails();
this.noticeImage = performance.getNoticeImage();
this.notice = performance.getNotice();
this.approvalUrl = performance.getApprovalUrl();
this.rejectTxt = performance.getRejectTxt();
if (performance.getApprovalUrl() == null || performance.getApprovalUrl().isEmpty()) {
this.statusSell = 0;
} else {
this.statusSell = 1;
}
}
public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime, LocalDateTime sellTime, int isAdvance, int isDiscount, int payCountdownMinute) {
this.isLackRegister = isLackRegister;
this.isMember = isMember;
......@@ -194,10 +215,40 @@ public class KylinPerformanceVo {
this.isBackPaperTicket = performanceStatus.getIsBackPaperTicket();
}
public void setPerformanceStatus(PerformancePartnerVo performanceStatus) {
this.statusSell = performanceStatus.getStatusSell();
this.isRecommend = 0;
this.isTrueName = performanceStatus.getIsTrueName();
this.limitCount = performanceStatus.getLimitCount();
this.limitCountMember = 1;
this.sysDamai = 0;
this.isShow = performanceStatus.getIsShow();
this.isCanRefund = 0;
this.isOpenRefundPresent = 0;
this.refundOpenTime = null;
this.refundCloseTime = null;
this.isTransfer = 0;
this.transferStartTime = null;
this.transferEndTime = null;
this.isRefundPoundage = 0;
this.isRefundVoucher = 0;
this.isRefundExpress = 0;
this.auditStatus = performanceStatus.getAuditStatus();
this.fieldAuditStatus = performanceStatus.getFieldAuditStatus();
this.isBackPaperTicket = 0;
}
public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
this.fieldId = performanceRelations.getFieldId();
this.projectId = performanceRelations.getProjectId();
this.roadShowId = performanceRelations.getRoadShowId();
this.merchantId = performanceRelations.getMerchantId();
}
public void setPerformanceRelations(PerformancePartnerVo performanceRelations) {
this.fieldId = performanceRelations.getFieldId();
this.projectId = performanceRelations.getProjectId();
this.roadShowId = performanceRelations.getRoadShowId();
this.merchantId = performanceRelations.getMerchantId();
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @ afc76bec
......@@ -161,9 +161,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
performanceVoUtils.performanceVoStatus(performancesId);
//权限
KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
innerService.reportP(dataUtils.getPerformanceVo(performancesId),data.getApprovalUrl(),data.getSponsorId());
} else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
log.info(" PERFORMANCE 演出审核 修改");
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/KylinBuyNoticeParnterController.java
View file @ afc76bec
......@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
import com.liquidnet.service.merchant.util.InnerUtils;
import com.liquidnet.service.merchant.util.MongoMerchantUtils;
import com.liquidnet.service.merchant.util.PerformanceUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -37,6 +38,8 @@ public class KylinBuyNoticeParnterController {
private IKylinBuyNoticePartnerService buyNoticePartnerService;
@Autowired
InnerUtils innerUtils;
@Autowired
PerformanceUtils performanceUtils;
@GetMapping(value = "buyNotice")
@ApiOperation(value = "购票须知列表", position = 1)
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @ afc76bec
......@@ -277,6 +277,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
mapSql.put("rejectTxt", "");
mapSql.put("status", 1);
mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceUtils.submitVo(performanceId);
performanceUtils.createPerformanceMySql(performanceId, mapSql, kylinPerformanceMisVo, createdAt);
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_TICKET_UPDATE.getKey(),
SqlMapping.get("kylin_performances.auditTime",
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/MongoMerchantUtils.java
View file @ afc76bec
......@@ -287,7 +287,8 @@ public class MongoMerchantUtils {
}
}
List<KylinPerformanceVo> performanceVos = mongoTemplate.find(
Query.query(criteria.orOperator(Criteria.where("uid").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
Query.query(new Criteria().orOperator(criteria,Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
// Query.query(criteria.orOperator(Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
//查询销量
Aggregation aggregation = Aggregation.newAggregation(
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java
View file @ afc76bec
package com.liquidnet.service.merchant.util;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
......@@ -12,6 +13,7 @@ import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.service.MerchantRdmService;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.BeanUtils;
......@@ -35,6 +37,8 @@ public class PerformanceUtils {
@Autowired
private MongoMerchantUtils mongoMerchantUtils;
@Autowired
private MerchantRdmService merchantRdmService;
@Autowired
QueueUtil queueUtil;
@Autowired
PerformanceUtils performanceUtils;
......@@ -615,4 +619,112 @@ public class PerformanceUtils {
return null;
}
}
public KylinPerformanceVo submitVo(String performanceId) {
try {
KylinPerformanceVo voData = new KylinPerformanceVo();
//演出数据
PerformancePartnerVo p = mongoMerchantUtils.getPerformancePartnerVo(performanceId);
//场地相关数据
KylinFields fields = new KylinFields();
MerchantFieldsVo fieldsVo = merchantRdmService.getFieldsVoByFieldId(p.getFieldId());
String cityName = fieldsVo.getCityName();
fields.setCityId(null);
fields.setLatitude(fieldsVo.getLatitude());
fields.setLongitude(fieldsVo.getLongitude());
fields.setCityName(cityName);
fields.setName(fieldsVo.getName());
//相关状态时间初始变量
LocalDateTime stopSellTime = null;
LocalDateTime sellMemberTime = null;
LocalDateTime sellTime = null;
int isLackRegister = 0;
int isMember = 0;
int isExclusive = 0;
int isAdvance = 0;
int isDiscount = 0;
int payCountdownMinute = 15;
BigDecimal price = new BigDecimal("0.00");
//场次数据
List<KylinTicketTimesPartnerVo> ttList = mongoMerchantUtils.getTicketTimesPartnerVoList(performanceId);
List<KylinTicketTimesVo> timeList = new ArrayList<>();
for (int x = 0; x < ttList.size(); x++) {
KylinTicketTimesPartnerVo tt = ttList.get(x);
//票种数据
List<KylinTicketPartnerVo> tList = mongoMerchantUtils.getTicketPartnerVoList(tt.getTicketTimesId());
List<KylinTicketVo> ticketList = new ArrayList<>();
for (int y = 0; y < tList.size(); y++) {
KylinTicketPartnerVo t = tList.get(y);
KylinTicketVo kylinTicketVo = new KylinTicketVo();
kylinTicketVo.setTimeId(t.getTimesId());
kylinTicketVo.setTicket(t);
kylinTicketVo.setTicketStatus(t, p.getIsTrueName());
ticketList.add(kylinTicketVo);
if (kylinTicketVo.getIsMember() == 1) {
if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {
isDiscount = 1;
}
if (DateUtil.compareStrDay(DateUtil.getNowTime(), kylinTicketVo.getMemberTimeStart()) < 0) {
isAdvance = 1;
}
if (kylinTicketVo.getIsMember() == 1) {
isMember = 1;
}
if (kylinTicketVo.getIsExclusive() == 1) {
isExclusive = 1;
}
}
if (kylinTicketVo.getIsLackRegister() == 1) {
isLackRegister = 1;
}
payCountdownMinute = 5;
if (price.compareTo(new BigDecimal("0.00")) == 0) {
price = kylinTicketVo.getPrice();
} else {
if (kylinTicketVo.getPrice().compareTo(price) < 0) {
price = kylinTicketVo.getPrice();
}
}
LocalDateTime tTimeStart = LocalDateTime.parse(t.getTimeStart(),DTF_YMD_HMS);
LocalDateTime tTimeEnd = LocalDateTime.parse(t.getTimeEnd(),DTF_YMD_HMS);
if (stopSellTime == null || stopSellTime.isBefore(tTimeEnd)) {
stopSellTime = tTimeEnd;
}
if (sellMemberTime == null || sellMemberTime.isAfter(tTimeStart.plusMinutes(-5))) {
sellMemberTime = tTimeStart.plusMinutes(-5);
}
if (sellTime == null || sellTime.isAfter(tTimeStart)) {
sellTime = tTimeStart;
}
}
KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
kylinTicketTimesVo.setTicketTimes(tt);
kylinTicketTimesVo.setPerformanceId(tt.getPerformancesId());
kylinTicketTimesVo.setTimeId(tt.getTicketTimesId());
kylinTicketTimesVo.setTicketList(ticketList);
timeList.add(kylinTicketTimesVo);
}
voData.setPerformance(p);
voData.setPerformanceStatus(p);
voData.setPerformanceRelations(p);
voData.setFieldsData(fields, cityName);
voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellMemberTime, sellTime, isAdvance, isDiscount, payCountdownMinute);
voData.setTicketTimeList(timeList);
voData.setAppStatus(p.getStatus());
mongoMerchantUtils.insertPerformanceVo(voData);
return voData;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
}
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