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

Commit dbdc578e authored by 胡佳晨's avatar 胡佳晨

修改 列表

parent afc9c2c7
...@@ -37,6 +37,7 @@ public abstract class DateUtil { ...@@ -37,6 +37,7 @@ public abstract class DateUtil {
yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"), yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"),
yyyyMMddHHmmssTrim("yyyyMMddHHmmss"), yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"), yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"),
yyyyMMddHHmmssS("yyyy-MM-dd HH:mm:ss.S"),
ddHHmmssTrim("ddHHmmss"), ddHHmmssTrim("ddHHmmss"),
yyyy_MM_dd_zh("yyyy年MM月dd日"), yyyy_MM_dd_zh("yyyy年MM月dd日"),
MM_dd_zh("MM月dd日"), MM_dd_zh("MM月dd日"),
......
...@@ -164,7 +164,13 @@ public class MongoVoUtils { ...@@ -164,7 +164,13 @@ public class MongoVoUtils {
KylinOrderTicketVo data = dataUtils.getOrderTicketVo(orderId); KylinOrderTicketVo data = dataUtils.getOrderTicketVo(orderId);
BeanUtils.copyProperties(data, voItem); BeanUtils.copyProperties(data, voItem);
redisVo.add(voItem); redisVo.add(voItem);
redisVo.addAll(dataUtils.getOrderList(userId)); List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
if(redisData.size()>0){
if(redisData.get(0).getOrderTicketsId().equals(orderId)){
redisData.remove(0);
}
}
redisVo.addAll(redisData);
switch (type) { switch (type) {
case 1: case 1:
......
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