update:购物车显示商品图片

fengliang
1 parent d1873f62
Showing 7 changed files with 26 additions and 6 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ShopCartMessageDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/IShopCartMessageService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/IShopCartService.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
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/shopCart/ShopCartMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/shopCart/ShopCartMessageMapper.xml
@@ -99,6 +99,8 @@ public class ShopCartMessageDto implements Serializable {
     /** 商品名称 */
     private String productName;
+    private LocalDateTime modifiedTime;
+
     public LocalDateTime getCacheTime() {
         return cacheTime;
     }
@@ -241,4 +243,12 @@ public class ShopCartMessageDto implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public LocalDateTime getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(LocalDateTime modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
 }
@@ -4,6 +4,7 @@ import com.diligrp.etrade.order.domain.ShopCartDto;
 import com.diligrp.etrade.order.domain.ShopCartMessageDto;
 import com.diligrp.etrade.order.model.ShopCartMessage;
+import java.time.LocalDateTime;
 import java.util.List;
 public interface IShopCartMessageService {
@@ -16,7 +17,7 @@ public interface IShopCartMessageService {
     void updateShopCartMessage(ShopCartMessageDto shopCartMessageDto);
-    void updateByOld(ShopCartMessage shopCartMessageOld,ShopCartMessageDto shopCartMessageDto,Boolean bo);
+    void updateByOld(ShopCartMessage shopCartMessageOld, ShopCartMessageDto shopCartMessageDto, Boolean bo);
     List<ShopCartMessage> findList(ShopCartMessageDto shopCartMessageDto);
@@ -2,6 +2,7 @@ package com.diligrp.etrade.order.service;
 import com.diligrp.etrade.order.domain.*;
+import java.time.LocalDateTime;
 import java.util.List;
 public interface IShopCartService {
@@ -10,7 +11,7 @@ public interface IShopCartService {
     List<ShopCartVo> listShopCart(ShopCartDto shopCartDto);
-    void saveShopCart(ShopCartDto shopCartDto,boolean flag);
+    void saveShopCart(ShopCartDto shopCartDto, boolean flag);
     void updateShopcartList(List<ShopCartCacheDto> shopCartCacheDtoList);
@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -241,6 +242,7 @@ public class ShopCartImpl implements IShopCartService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateShopcartList(List<ShopCartCacheDto> shopCartCacheDtoList) {
+        LocalDateTime now = LocalDateTime.now();
         shopCartCacheDtoList.forEach(shopCartCacheDto -> {
             List<ShopCartMessageDto> shopCartMessageDtos = shopCartCacheDto.getShopCartMessageDtos();
             if (!CollectionUtils.isEmpty(shopCartMessageDtos)){
@@ -251,6 +253,7 @@ public class ShopCartImpl implements IShopCartService {
                     if(StringUtils.isBlank(shopCartMessageDto.getProductUrl())){
                         shopCartMessageDto.setProductUrl(shopCartMessageDto.getUrl());
                     }
+                    shopCartMessageDto.setModifiedTime(now);
                     shopCartDto.setShopCartMessageDto(shopCartMessageDto);
                     return shopCartDto;
                 }).toList();
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.time.LocalDateTime;
 import java.util.List;
 /**
@@ -141,7 +142,7 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
         //如果是处理离线缓存数据，bo=true,总重量做覆盖，不是处理离线数据，总重量做增量
         if (bo) {
             //如果缓存时间在更新之前之前，说明缓存数据不是最新数据，则不进行更新操作
-            if (shopCartMessageDto.getCacheTime().isBefore(shopCartMessageOld.getModifiedTime())) {
+            if (!shopCartMessageDto.getCacheTime().isAfter(shopCartMessageOld.getModifiedTime())) {
                 return;
             }
         }else {
@@ -28,6 +28,7 @@
             <result column="weight" jdbcType="BIGINT" property="weight"/>
             <result column="amount" jdbcType="BIGINT" property="amount"/>
             <result column="type" jdbcType="TINYINT" property="type"/>
+            <result column="url" jdbcType="VARCHAR" property="url"/>
             <result column="scm_modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
             <result column="check_flag" jdbcType="TINYINT" property="checkFlag"/>
             <result column="alias" jdbcType="VARCHAR" property="alias"/>
@@ -253,9 +253,12 @@
             <if test="shopCartId != null">
                 shop_cart_id = #{shopCartId,jdbcType=BIGINT},
             </if>
-
-            modified_time = NOW(),
-
+            <if test="modifiedTime != null">
+                modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifiedTime == null">
+                modified_time = NOW(),
+            </if>
             <if test="marketId != null">
                 market_id = #{marketId,jdbcType=BIGINT},
             </if>