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

Commit 0965db7b authored by 胡佳晨's avatar 胡佳晨

修改 bug

parent 7259be96
...@@ -40,7 +40,7 @@ public class MemberUtil { ...@@ -40,7 +40,7 @@ public class MemberUtil {
String microTime = String.valueOf(calendar.getTimeInMillis() * 1000).substring(2, 5); String microTime = String.valueOf(calendar.getTimeInMillis() * 1000).substring(2, 5);
String sign = word.concat(month).concat(day).concat(time).concat(microTime); String sign = word.concat(month).concat(day).concat(time).concat(microTime);
sign = String.format(sign + "%02d", rand.nextInt(99)); sign = String.format(sign + "%02d", rand.nextInt(99));
sign = MD5.getStrMD5(sign); sign = MD5.getStrMD5(sign,null);
String s = "0123456789ABCDEFGHIJKLMNOPQRSTUV"; String s = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
......
package com.liquidnet.service.kylin.dto.vo.ignore; package com.liquidnet.service.kylin.dto.vo.ignore;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.entity.KylinTicketStatus; import com.liquidnet.service.kylin.entity.KylinTicketStatus;
import com.liquidnet.service.kylin.entity.KylinTickets; import com.liquidnet.service.kylin.entity.KylinTickets;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -81,12 +82,12 @@ public class KylinTicketIgnoreVo { ...@@ -81,12 +82,12 @@ public class KylinTicketIgnoreVo {
this.describes = ticket.getDescribes(); this.describes = ticket.getDescribes();
this.describeExpress = ticket.getDescribeExpress(); this.describeExpress = ticket.getDescribeExpress();
this.describeElectronic = ticket.getDescribeElectronic(); this.describeElectronic = ticket.getDescribeElectronic();
this.timeStart = ticket.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart());
this.timeEnd = ticket.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEnd());
this.memberTimeStart = ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()));
this.timeEndExpress = ticket.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeEndExpress = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEndExpress());
this.useStart = ticket.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseStart());
this.useEnd = ticket.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseEnd());
this.saleRemindMinute = ticket.getSaleRemindMinute(); this.saleRemindMinute = ticket.getSaleRemindMinute();
} }
......
package com.liquidnet.service.kylin.dto.vo.ignore; package com.liquidnet.service.kylin.dto.vo.ignore;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.entity.KylinTicketTimes; import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -31,7 +32,7 @@ public class KylinTicketTimesIgnoreVo { ...@@ -31,7 +32,7 @@ public class KylinTicketTimesIgnoreVo {
this.ticketTimesId=ticketTimes.getTicketTimesId(); this.ticketTimesId=ticketTimes.getTicketTimesId();
this.title=ticketTimes.getTitle(); this.title=ticketTimes.getTitle();
this.type=ticketTimes.getType(); this.type=ticketTimes.getType();
this.useStart=ticketTimes.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useStart= DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseStart());
this.useEnd=ticketTimes.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useEnd=DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseEnd());
} }
} }
package com.liquidnet.service.kylin.dto.vo.middle; package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.entity.KylinTicketTimes; import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -34,7 +35,7 @@ public class KylinTicketTimesVo { ...@@ -34,7 +35,7 @@ public class KylinTicketTimesVo {
this.ticketTimesId=ticketTimes.getTicketTimesId(); this.ticketTimesId=ticketTimes.getTicketTimesId();
this.title=ticketTimes.getTitle(); this.title=ticketTimes.getTitle();
this.type=ticketTimes.getType(); this.type=ticketTimes.getType();
this.useStart=ticketTimes.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useStart= DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseStart());
this.useEnd=ticketTimes.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useEnd=DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseEnd());
} }
} }
package com.liquidnet.service.kylin.dto.vo.middle; package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.entity.KylinTicketStatus; import com.liquidnet.service.kylin.entity.KylinTicketStatus;
import com.liquidnet.service.kylin.entity.KylinTickets; import com.liquidnet.service.kylin.entity.KylinTickets;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -100,17 +101,17 @@ public class KylinTicketVo { ...@@ -100,17 +101,17 @@ public class KylinTicketVo {
this.describes = ticket.getDescribes(); this.describes = ticket.getDescribes();
this.describeExpress = ticket.getDescribeExpress(); this.describeExpress = ticket.getDescribeExpress();
this.describeElectronic = ticket.getDescribeElectronic(); this.describeElectronic = ticket.getDescribeElectronic();
this.timeStart = ticket.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart());
this.timeEnd = ticket.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEnd());
this.advanceMinuteMember = ticket.getAdvanceMinuteMember(); this.advanceMinuteMember = ticket.getAdvanceMinuteMember();
this.memberTimeStart = ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()));
if (ticket.getTimeEndExpress() != null) { if (ticket.getTimeEndExpress() != null) {
this.timeEndExpress = ticket.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeEndExpress = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEndExpress());
} else { } else {
this.timeEndExpress = null; this.timeEndExpress = null;
} }
this.useStart = ticket.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseStart());
this.useEnd = ticket.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.useEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseEnd());
this.saleRemindMinute = ticket.getSaleRemindMinute(); this.saleRemindMinute = ticket.getSaleRemindMinute();
} }
...@@ -131,7 +132,7 @@ public class KylinTicketVo { ...@@ -131,7 +132,7 @@ public class KylinTicketVo {
this.counts = ticketStatus.getCounts(); this.counts = ticketStatus.getCounts();
this.sysDamai = ticketStatus.getSyncDamai(); this.sysDamai = ticketStatus.getSyncDamai();
this.isShowCode = ticketStatus.getIsShowCode(); this.isShowCode = ticketStatus.getIsShowCode();
this.qrCodeShowTime = ticketStatus.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.qrCodeShowTime = DateUtil.Formatter.yyyyMMddHHmmss.format(ticketStatus.getQrCodeShowTime());
} }
......
package com.liquidnet.service.kylin.dto.vo.middle.message;
import lombok.Data;
@Data
public class MessageConfigVo {
private Boolean status;
private String id;
}
package com.liquidnet.service.kylin.dto.vo.middle.message;
import lombok.Data;
@Data
public class MessageDataVo {
private String name;
private String time;
}
package com.liquidnet.service.kylin.dto.vo.mongo; package com.liquidnet.service.kylin.dto.vo.mongo;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.entity.KylinFields; import com.liquidnet.service.kylin.entity.KylinFields;
import com.liquidnet.service.kylin.entity.KylinPerformanceRelations; import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
...@@ -103,8 +104,8 @@ public class KylinPerformanceVo { ...@@ -103,8 +104,8 @@ public class KylinPerformanceVo {
this.performancesId = performance.getPerformancesId(); this.performancesId = performance.getPerformancesId();
this.title = performance.getTitle(); this.title = performance.getTitle();
this.imgPoster = performance.getImgPoster(); this.imgPoster = performance.getImgPoster();
this.timeStart = performance.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeStart());
this.timeEnd = performance.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeEnd());
this.type = performance.getType(); this.type = performance.getType();
this.details =performance.getDetails(); this.details =performance.getDetails();
this.noticeImage = performance.getNoticeImage(); this.noticeImage = performance.getNoticeImage();
...@@ -115,8 +116,8 @@ public class KylinPerformanceVo { ...@@ -115,8 +116,8 @@ public class KylinPerformanceVo {
this.isMember = isMember; this.isMember = isMember;
this.isExclusive = isExclusive; this.isExclusive = isExclusive;
this.price = price + "起"; this.price = price + "起";
this.stopSellTime = stopSellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.stopSellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(stopSellTime);
this.sellTime = sellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); this.sellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(sellTime);
this.appStatus = 9; this.appStatus = 9;
this.isDiscount = isDiscount; this.isDiscount = isDiscount;
this.isAdvance = isAdvance; this.isAdvance = isAdvance;
......
...@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; ...@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.enums.BannersTargetType; import com.liquidnet.client.admin.common.enums.BannersTargetType;
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.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
...@@ -70,7 +71,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl ...@@ -70,7 +71,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
// 时间 // 时间
String bannersId = IDGenerator.nextSnowId().toString(); String bannersId = IDGenerator.nextSnowId().toString();
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
String createdAtString = createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String createdAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(createdAt);
if (StringUtils.isEmpty(bannersParam.getOnlineStartTime())) { if (StringUtils.isEmpty(bannersParam.getOnlineStartTime())) {
bannersParam.setOnlineStartTime(null); bannersParam.setOnlineStartTime(null);
} }
...@@ -143,7 +144,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl ...@@ -143,7 +144,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
// 时间 // 时间
String bannersId = bannersParam.getBannersId(); String bannersId = bannersParam.getBannersId();
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
String updatedAtString = updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String updatedAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(updatedAt);
KylinBanners params = bannersParam.getFields(null, null); KylinBanners params = bannersParam.getFields(null, null);
params.setUpdatedAt(updatedAtString); params.setUpdatedAt(updatedAtString);
...@@ -258,7 +259,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl ...@@ -258,7 +259,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
public Boolean delete(List<String> bannersId) { public Boolean delete(List<String> bannersId) {
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
String updatedAtString = updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String updatedAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(updatedAt);
KylinBanners kylinBanners = new KylinBanners(); KylinBanners kylinBanners = new KylinBanners();
kylinBanners.setUpdatedAt(updatedAtString); kylinBanners.setUpdatedAt(updatedAtString);
......
...@@ -4,7 +4,10 @@ import com.github.pagehelper.PageInfo; ...@@ -4,7 +4,10 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao; import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.param.*; import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl; import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
import com.liquidnet.service.kylin.utils.OtherUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponse;
...@@ -23,6 +26,8 @@ import java.util.Map; ...@@ -23,6 +26,8 @@ import java.util.Map;
@Validated @Validated
public class PerformancePartnerController { public class PerformancePartnerController {
@Autowired
private OtherUtils otherUtils;
@Autowired @Autowired
private KylinPerformancesPartnerServiceImpl performancesPartnerService; private KylinPerformancesPartnerServiceImpl performancesPartnerService;
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.dto.vo.KylinBannersVo; import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
import com.liquidnet.service.kylin.entity.KylinBanners; import com.liquidnet.service.kylin.entity.KylinBanners;
import com.liquidnet.service.kylin.mapper.KylinBannersMapper; import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
...@@ -39,7 +40,7 @@ public class BannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBan ...@@ -39,7 +40,7 @@ public class BannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBan
); );
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
Criteria onlineTimeBetween = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").gte(nowTimeStr); Criteria onlineTimeBetween = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").gte(nowTimeStr);
Criteria onlineTimeGt = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").is(""); Criteria onlineTimeGt = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").is("");
Criteria onlineTimeLt = Criteria.where("onlineStartTime").is("").and("onlineEndTime").gte(nowTimeStr); Criteria onlineTimeLt = Criteria.where("onlineStartTime").is("").and("onlineEndTime").gte(nowTimeStr);
......
...@@ -38,9 +38,6 @@ import org.springframework.beans.BeanUtils; ...@@ -38,9 +38,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
...@@ -640,7 +637,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -640,7 +637,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
RLock lock = RedisLockUtil.lock("order_lock:" + syncOrderParam.getOrder_code(), 240); RLock lock = RedisLockUtil.lock("order_lock:" + syncOrderParam.getOrder_code(), 240);
String timePay = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String timePay = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrder_code())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName()); KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrder_code())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
if (orderTicketData == null) { if (orderTicketData == null) {
lock.unlock(); lock.unlock();
......
...@@ -111,7 +111,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -111,7 +111,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
// 固定查询条件 // 固定查询条件
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr)); query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
// 查询总数 // 查询总数
...@@ -166,7 +166,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -166,7 +166,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
// 固定条件 // 固定条件
Query query = new Query(); Query query = new Query();
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr)); query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
// 今天的 // 今天的
...@@ -182,7 +182,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -182,7 +182,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
// 三天的 // 三天的
Query queryT = new Query(); Query queryT = new Query();
LocalDateTime nowTimeT = LocalDateTime.now(); LocalDateTime nowTimeT = LocalDateTime.now();
String nowTimeStrT = nowTimeT.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String nowTimeStrT = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTimeT);
queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT)); queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT));
LocalDateTime threeDaysLater = toDayTime.plusDays(3); LocalDateTime threeDaysLater = toDayTime.plusDays(3);
...@@ -202,7 +202,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -202,7 +202,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
// 固定条件 // 固定条件
Query query = new Query(); Query query = new Query();
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr)); query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
query.fields().exclude("details"); query.fields().exclude("details");
...@@ -219,7 +219,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -219,7 +219,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
// 固定条件 // 固定条件
Query query = new Query(); Query query = new Query();
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr)); query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
query.fields().exclude("details"); query.fields().exclude("details");
......
...@@ -229,7 +229,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -229,7 +229,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) {// 修改 } 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 演出第二步 修改");
} }
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl.partner; ...@@ -2,6 +2,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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
...@@ -107,8 +108,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -107,8 +108,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
KylinTicketPartnerVo kylinTicketPartnerVo = new KylinTicketPartnerVo(); KylinTicketPartnerVo kylinTicketPartnerVo = new KylinTicketPartnerVo();
BeanUtils.copyProperties(ticketCreateParam, kylinTicketPartnerVo); BeanUtils.copyProperties(ticketCreateParam, kylinTicketPartnerVo);
kylinTicketPartnerVo.setTicketsId(ticketsId); kylinTicketPartnerVo.setTicketsId(ticketsId);
kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketPartnerVo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(createdAt));
kylinTicketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketPartnerVo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(ticketCreateParam.getTimeStart()));
kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName()); KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
......
package com.liquidnet.service.kylin.utils;
import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.MD5;
import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.security.MessageDigest;
import java.time.LocalDateTime;
@Service
@Slf4j
public class OtherUtils {
@Value("${liquidnet.url-service.url}")
private String serviceUrl;
//发短信
public boolean sendMessage(String mobile, MessageDataVo data, MessageConfigVo configVo, Integer sign_id) {
try {
if (null != configVo && null != configVo.getStatus() && configVo.getStatus()) {
LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<>();
httpData.add("mobile", mobile);
httpData.add("templateId", configVo.getId());
httpData.add("signId", sign_id.toString());
httpData.add("data", JsonUtils.toJson(data));
String sign = Ksort(httpData);
sign = sign.concat("&key=").concat("R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V");
sign = sign.toUpperCase();
httpData.add("sign", sign);
String returnData = HttpUtil.post(serviceUrl + "sendSmsMessage", httpData);
JsonNode postResultNew = JsonUtils.fromJson(returnData, JsonNode.class);
if (postResultNew.get("message").toString() != "OK") {
return false;
} else {
return true;
}
} else {
return false;
}
} catch (Exception e) {
e.printStackTrace();
return false;
}
}
public String Ksort(MultiValueMap<String, String> map) {
String sb = "";
String[] key = new String[map.size()];
int index = 0;
for (String k : map.keySet()) {
key[index] = k;
index++;
}
for (String s : key) {
sb += s + "=" + map.get(s).get(0) + "&";
}
sb = sb.substring(0, sb.length() - 1);
// 将得到的字符串进行处理得到目标格式的字符串
try {
sb = URLDecoder.decode(sb, "UTF-8");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}// 使用常见的UTF-8编码
sb = sb.replace("%3D", "=").replace("%26", "&");
return sb;
}
public static String md5s(String txt) {
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(txt.getBytes("GBK")); //问题主要出在这里,Java的字符串是unicode编码,不受源码文件的编码影响;而PHP的编码是和源码文件的编码一致,受源码编码影响。
StringBuilder buf = new StringBuilder();
for (byte b : md.digest()) {
buf.append(String.format("%02x", b & 0xff));
}
return buf.toString();
} 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