修改 列表

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/MongoVoUtils.java

@@ -115,9 +115,9 @@ public class MongoVoUtils {
                         isLackRegister = 1;
                     }
                     payCountdownMinute = t1.getPayCountdownMinute();
-                    if(price.compareTo(new BigDecimal("0.00"))==0){
+                    if (price.compareTo(new BigDecimal("0.00")) == 0) {
                         price = kylinTicketVo.getPrice();
-                    }else {
+                    } else {
                         if (kylinTicketVo.getPrice().compareTo(price) < 0) {
                             price = kylinTicketVo.getPrice();
                         }
@@ -158,14 +158,16 @@ public class MongoVoUtils {
      */
     public Boolean resetOrderListVo(String userId, Integer type, String orderId) {
         List<KylinOrderListVo> vo = new ArrayList<>();
-        List<KylinOrderListVo> redisVo = dataUtils.getOrderList(userId);
-        KylinOrderTicketVo data ;
-        KylinOrderListVo voItem ;
+        List<KylinOrderListVo> redisVo = new ArrayList();
+        KylinOrderListVo voItem = new KylinOrderListVo();
+
+        KylinOrderTicketVo data = dataUtils.getOrderTicketVo(orderId);
+        BeanUtils.copyProperties(data, voItem);
+        redisVo.add(voItem);
+        redisVo.addAll(dataUtils.getOrderList(userId));
+
         switch (type) {
             case 1:
-                data = dataUtils.getOrderTicketVo(orderId);
-                voItem = new KylinOrderListVo();
-                BeanUtils.copyProperties(data, voItem);
                 for (int i = 0; i < redisVo.size(); i++) {
                     if (i == 40) {
                         break;
@@ -176,12 +178,12 @@ public class MongoVoUtils {
                         vo.add(redisVo.get(i - 1));
                     }
                 }
+                if (redisVo.size() == 0) {
+                    vo.add(voItem);
+                }
                 dataUtils.setOrderTicketVo(userId, vo);
                 return true;
             case 2:
-                data = dataUtils.getOrderTicketVo(orderId);
-                voItem = new KylinOrderListVo();
-                BeanUtils.copyProperties(data, voItem);
                 for (int i = 0; i < redisVo.size(); i++) {
                     if (i == 40) {
                         break;