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

Skip to content

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

限购相关

parent b0f00609
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 21 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @ 1f568746
......@@ -114,6 +114,7 @@ public class KylinPerformanceVo {
this.details =performance.getDetails();
this.noticeImage = performance.getNoticeImage();
this.notice=performance.getNotice();
this.approvalUrl=performance.getApprovalUrl();
}
public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime,int isAdvance,int isDiscount,int payCountdownMinute) {
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketsPartnerService.java
View file @ 1f568746
......@@ -65,7 +65,7 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
* @param timesId 场次id
* @return boolean
*/
boolean submitTicketByTimes(String timesId);
boolean submitTicketByTimes(String timesId,Integer status);
/**
* 从mongo 获取 当前场次所有 票
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java
View file @ 1f568746
......@@ -111,8 +111,12 @@ public class MongoVoUtils {
isLackRegister = 1;
}
payCountdownMinute = t1.getPayCountdownMinute();
if (price.subtract(kylinTicketVo.getPrice()).compareTo(new BigDecimal("0.00")) > 0) {
if(price.compareTo(new BigDecimal("0.00"))==0){
price = kylinTicketVo.getPrice();
}else {
if (kylinTicketVo.getPrice().compareTo(price) < 0) {
price = kylinTicketVo.getPrice();
}
}
if (stopSellTime == null || stopSellTime.isBefore(t1.getTimeEnd())) {
stopSellTime = t1.getTimeEnd();
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 1f568746
......@@ -153,8 +153,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
String timeStart = ticketData.getTimeStart(); // 普通开售时间
String timeEnd = ticketData.getTimeEnd(); // 购票停售时间
String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
// boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
boolean isMember = true;
boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
// boolean isMember = true;
int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
if (ticketData.getIsExclusive() == 1) {
memberType = 2;
......@@ -290,10 +290,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
orderTickets.setOrderTicketsId(orderTicketId);
orderTickets.setUserId(uid);
Map token = CurrentUtil.getTokenClaims();
// orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
// orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
orderTickets.setUserName("");
orderTickets.setUserMobile("");
orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
// orderTickets.setUserName("");
// orderTickets.setUserMobile("");
orderTickets.setPerformanceTitle(performanceData.getTitle());
orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
orderTickets.setPayCode("");
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @ 1f568746
......@@ -274,7 +274,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
//提交 票
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) {
boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId(), null);
if (boolResult) {
return ResponseDto.failure(ErrorMapping.get(20114));
}
......@@ -337,8 +337,13 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
// 获取第一步数据
if (step2Param.getIsSubmit() == 1) { // 提交
map.put("status", 1);
map.put("auditStatus", 0);
if (performanceVoTask.judgeIsAudit(performanceId)) {
map.put("auditStatus", 0);
map.put("status", 1);
} else {
map.put("auditStatus", 1);
map.put("status", 9);
}
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
......@@ -347,7 +352,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
//提交 票
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVoList) {
boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId(), (int) (map.get("status")));
if (boolResult) {
return ResponseDto.failure(ErrorMapping.get(20114));
}
......@@ -359,17 +364,13 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
HashMap<String, Object> mapSql = new HashMap<>();
mapSql.put("rejectTxt", "");
mapSql.put("status", 1);
mapSql.put("status", map.get("status"));
mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
KylinPerformances performances = new KylinPerformances();
performances.setAuditTime(LocalDateTime.now());
performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
if(performanceVoTask.judgeIsAudit(performanceId)) {
performanceStatus.setAuditStatus(0);
}else{
performanceStatus.setAuditStatus(1);
}
performanceStatus.setAuditStatus((int)map.get("auditStatus"));
performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
//提示：票种价格、售票时间、购票限制 直接生效
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 1f568746
......@@ -308,11 +308,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
}
@Override
public boolean submitTicketByTimes(String timesId) {
public boolean submitTicketByTimes(String timesId,Integer status) {
LocalDateTime updatedAt = LocalDateTime.now();
HashMap<String, Object> map = new HashMap<>();
map.put("status", 1);
if(null==status) {
map.put("status", 1);
}else{
map.put("status", status);
}
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
UpdateResult updateResult = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/MongoVoUtils.java
View file @ 1f568746
......@@ -115,8 +115,12 @@ public class MongoVoUtils {
isLackRegister = 1;
}
payCountdownMinute = t1.getPayCountdownMinute();
if (price.subtract(kylinTicketVo.getPrice()).compareTo(new BigDecimal("0.00")) > 0) {
if(price.compareTo(new BigDecimal("0.00"))==0){
price = kylinTicketVo.getPrice();
}else {
if (kylinTicketVo.getPrice().compareTo(price) < 0) {
price = kylinTicketVo.getPrice();
}
}
if (stopSellTime == null || stopSellTime.isBefore(t1.getTimeEnd())) {
stopSellTime = t1.getTimeEnd();
......
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