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

Commit 6e3f5cce authored by 胡佳晨's avatar 胡佳晨

修改时间

parent 0965db7b
package com.liquidnet.service.kylin.dto.param; package com.liquidnet.service.kylin.dto.param;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -71,6 +72,7 @@ public class PerformancePartnerListParam { ...@@ -71,6 +72,7 @@ public class PerformancePartnerListParam {
public void setStopSellDay(Long stopSellDay) { public void setStopSellDay(Long stopSellDay) {
this.stopSellDay=stopSellDay; this.stopSellDay=stopSellDay;
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
this.stopSellTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now.plusDays(-stopSellDay)); this.stopSellTime =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now.plusDays(-stopSellDay));
} }
} }
...@@ -111,8 +111,8 @@ public class PerformanceVoUtils { ...@@ -111,8 +111,8 @@ public class PerformanceVoUtils {
ticketCount += kylinTicketVoList.size(); ticketCount += kylinTicketVoList.size();
for (KylinTicketVo kylinTicketVoItem : kylinTicketVoList) { for (KylinTicketVo kylinTicketVoItem : kylinTicketVoList) {
//时间判断 //时间判断
LocalDateTime timeStart = LocalDateTime.parse(kylinTicketVoItem.getMemberTimeStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime timeStart = DateUtil.Formatter.yyyyMMddHHmmss.parse(kylinTicketVoItem.getMemberTimeStart());
LocalDateTime timeEnd = LocalDateTime.parse(kylinTicketVoItem.getTimeEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.parse(kylinTicketVoItem.getTimeEnd());
int surplusGeneral = -1; int surplusGeneral = -1;
int status = 0; int status = 0;
if (timeStart.isAfter(timeNow)) { if (timeStart.isAfter(timeNow)) {
......
...@@ -474,10 +474,6 @@ public abstract class DateUtil { ...@@ -474,10 +474,6 @@ public abstract class DateUtil {
return dayLast + " 23:59:59"; return dayLast + " 23:59:59";
} }
public static LocalDateTime stringToLocalDateTime(String str) {
return LocalDateTime.parse(str, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
public static void main(String[] args) { public static void main(String[] args) {
// //
......
...@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.impl.partner; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -80,7 +81,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky ...@@ -80,7 +81,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
for (CheckPerformanceRelationParam item : param.getCheckPerformanceRelationParamList()) { for (CheckPerformanceRelationParam item : param.getCheckPerformanceRelationParamList()) {
KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances(); KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
checkUserPerformances.setCheckUserId(param.getCheckUserId()); checkUserPerformances.setCheckUserId(param.getCheckUserId());
checkUserPerformances.setCanDownTime(LocalDateTime.parse(item.getCanDownTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); checkUserPerformances.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(item.getCanDownTime()));
checkUserPerformances.setPerformanceId(item.getPerformanceId()); checkUserPerformances.setPerformanceId(item.getPerformanceId());
checkUserPerformances.setCheckUserPerformanceId(IDGenerator.nextSnowId().toString()); checkUserPerformances.setCheckUserPerformanceId(IDGenerator.nextSnowId().toString());
checkUserPerformances.setCreatedAt(LocalDateTime.now()); checkUserPerformances.setCreatedAt(LocalDateTime.now());
......
...@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; ...@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -229,7 +230,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -229,7 +230,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) { if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
result = createStep2(step2Param); result = createStep2(step2Param);
log.info(" PERFORMANCE 演出第二步 创建(拒绝/撤回/第一次)"); log.info(" PERFORMANCE 演出第二步 创建(拒绝/撤回/第一次)");
} else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7|| performanceStatus.getStatus() == 8|| performanceStatus.getStatus() == 9) {// 修改 } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9) {// 修改
result = updateStep2(step2Param); result = updateStep2(step2Param);
log.info(" PERFORMANCE 演出第二步 修改"); log.info(" PERFORMANCE 演出第二步 修改");
} }
...@@ -388,8 +389,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -388,8 +389,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
inventory.setLimitCount(ticketItem.getLimitCount()); inventory.setLimitCount(ticketItem.getLimitCount());
//修改 mysql 售卖时间 //修改 mysql 售卖时间
KylinTickets ticketSellTime = new KylinTickets(); KylinTickets ticketSellTime = new KylinTickets();
ticketSellTime.setTimeEnd(LocalDateTime.parse(ticketItem.getTimeEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); ticketSellTime.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEnd()));
ticketSellTime.setTimeStart(LocalDateTime.parse(ticketItem.getTimeStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); ticketSellTime.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()));
ticketSellTime.setAdvanceMinuteMember(null); ticketSellTime.setAdvanceMinuteMember(null);
//修改 价格 //修改 价格
ticketSellTime.setPrice(ticketItem.getPrice()); ticketSellTime.setPrice(ticketItem.getPrice());
...@@ -502,7 +503,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -502,7 +503,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
dataUtils.updatePerformanceMongo(performancesId); dataUtils.updatePerformanceMongo(performancesId);
return ResponseDto.success("下线成功"); return ResponseDto.success("下线成功");
}else{ } else {
return ResponseDto.failure(ErrorMapping.get(20111)); return ResponseDto.failure(ErrorMapping.get(20111));
} }
......
...@@ -119,8 +119,8 @@ public class PerformanceVoTask { ...@@ -119,8 +119,8 @@ public class PerformanceVoTask {
ticketCount += kylinTicketVoList.size(); ticketCount += kylinTicketVoList.size();
for (KylinTicketVo kylinTicketVoItem : kylinTicketVoList) { for (KylinTicketVo kylinTicketVoItem : kylinTicketVoList) {
//时间判断 //时间判断
LocalDateTime timeStart = LocalDateTime.parse(kylinTicketVoItem.getMemberTimeStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime timeStart = DateUtil.Formatter.yyyyMMddHHmmss.parse(kylinTicketVoItem.getMemberTimeStart());
LocalDateTime timeEnd = LocalDateTime.parse(kylinTicketVoItem.getTimeEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.parse(kylinTicketVoItem.getTimeEnd());
int surplusGeneral = -1; int surplusGeneral = -1;
int status = 0; int status = 0;
if (timeStart.isAfter(timeNow)) { if (timeStart.isAfter(timeNow)) {
......
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