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

Commit 65a72a78 authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/dev' into dev

parents 22398e9a 06efa5a8
...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.utils; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.utils;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component; ...@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@Component @Component
@Slf4j
public class OrderUtils { public class OrderUtils {
@Autowired @Autowired
...@@ -31,6 +33,7 @@ public class OrderUtils { ...@@ -31,6 +33,7 @@ public class OrderUtils {
} }
BeanUtils.copyProperties(data, voItem); BeanUtils.copyProperties(data, voItem);
List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId); List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
log.info("STEP0 = "+redisData.size());
if (type == 1) { if (type == 1) {
redisVo.add(voItem); redisVo.add(voItem);
if (redisData.size() > 0) { if (redisData.size() > 0) {
...@@ -41,7 +44,7 @@ public class OrderUtils { ...@@ -41,7 +44,7 @@ public class OrderUtils {
} }
redisVo.addAll(redisData); redisVo.addAll(redisData);
log.info("STEP1 = "+redisVo.size());
switch (type) { switch (type) {
case 1: case 1:
for (int i = 0; i < redisVo.size(); i++) { for (int i = 0; i < redisVo.size(); i++) {
...@@ -70,6 +73,7 @@ public class OrderUtils { ...@@ -70,6 +73,7 @@ public class OrderUtils {
vo.add(redisVo.get(i)); vo.add(redisVo.get(i));
} }
} }
log.info("STEP2 = "+vo.size());
dataUtils.setOrderList(userId, vo); dataUtils.setOrderList(userId, vo);
return true; return true;
default: default:
......
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