update:购物车时间修正

fengliang
1 parent 202ff18f
Showing 3 changed files with 17 additions and 0 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ShopCartVo.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartMessageServiceImpl.java
@@ -72,6 +72,11 @@ public class ShopCartVo implements Serializable {
      */
     private String location;
+    /**
+     * 系统时间
+     */
+    private LocalDateTime systemTime;
+
     private List<ShopCartMessageVo> shopCartMessageVoList;
     public String getShopName() {
@@ -184,6 +189,7 @@ public class ShopCartVo implements Serializable {
                 ", customerName='" + customerName + '\'' +
                 ", version=" + version +
                 ", location=" + location +
+                ", systemTime=" + systemTime +
                 ", shopCartMessageVoList=" + shopCartMessageVoList +
                 '}';
     }
@@ -195,4 +201,12 @@ public class ShopCartVo implements Serializable {
     public void setLocation(String location) {
         this.location = location;
     }
+
+    public LocalDateTime getSystemTime() {
+        return systemTime;
+    }
+
+    public void setSystemTime(LocalDateTime systemTime) {
+        this.systemTime = systemTime;
+    }
 }
@@ -152,6 +152,7 @@ public class ShopCartImpl implements IShopCartService {
             //对购物车商品信息集合按修改时间倒序排序
             List<ShopCartMessageVo> shopCartMessageVos = shopCartMessageVoList.stream().sorted(Comparator.comparing(ShopCartMessageVo::getModifiedTime, Comparator.reverseOrder())).collect(Collectors.toList());
             shopCartVo.setShopCartMessageVoList(shopCartMessageVos);
+            shopCartVo.setSystemTime(LocalDateTime.now());
         });
         //对购物车集合按修改时间倒序排序
         return shopCartVos.stream().sorted(Comparator.comparing(ShopCartVo::getModifiedTime, Comparator.reverseOrder())).collect(Collectors.toList());
@@ -145,7 +145,9 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
             if (!shopCartMessageDto.getCacheTime().isAfter(shopCartMessageOld.getModifiedTime())) {
                 return;
             }
+            shopCartMessageDto.setModifiedTime(shopCartMessageDto.getCacheTime()==null?LocalDateTime.now():shopCartMessageDto.getCacheTime());
         }else {
+            shopCartMessageDto.setModifiedTime(LocalDateTime.now());
             shopCartMessageDto.setWeight(shopCartMessageDto.getWeight() + shopCartMessageOld.getWeight());
         }
         //小计（分/斤）=单价（分/斤）*重量（克）/500