update:购物车冗余商品图片以及商品名称。

fengliang
1 parent c49907f0
Showing 7 changed files with 42 additions and 13 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/ShopCartApi.java
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/impl/ShopCartImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartMessageServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/util/ShopCartCheckOut.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/shopCart/ShopCartMapper.xml
@@ -74,7 +74,7 @@ public class ShopCartApi {
                 throw new OrderException(OrderErrorCode.PARAM_ERROR,"重复提交");
             }
             bucket.set(1, Duration.ofSeconds(1));
-            shopCartService.saveShopCart(shopCartDto,false);
+            shopCartService.saveShopCart(shopCartDto,true);
             return Message.success();
         }finally {
             lock.unlock();
@@ -93,6 +93,9 @@ public class ShopCartMessageDto implements Serializable {
     private Integer checkFlag;
     /** 商品图片 */
     private String productUrl;
+
+    /** 商品图片 */
+    private String url;
     /** 商品名称 */
     private String productName;
@@ -230,4 +233,12 @@ public class ShopCartMessageDto implements Serializable {
     public void setProductName(String productName) {
         this.productName = productName;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }
@@ -16,7 +16,7 @@ public interface IShopCartMessageService {
     void updateShopCartMessage(ShopCartMessageDto shopCartMessageDto);
-    void updateByOld(ShopCartMessage shopCartMessageOld,ShopCartMessageDto shopCartMessageDto,Boolean bo,boolean checkflag);
+    void updateByOld(ShopCartMessage shopCartMessageOld,ShopCartMessageDto shopCartMessageDto,Boolean bo);
     List<ShopCartMessage> findList(ShopCartMessageDto shopCartMessageDto);
@@ -21,6 +21,7 @@ import com.diligrp.etrade.shop.domain.response.ProductPresetVo;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
 import com.diligrp.etrade.shop.service.ProductService;
 import com.diligrp.etrade.shop.service.ShopService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -130,8 +131,6 @@ public class ShopCartImpl implements IShopCartService {
 //                    AssertUtils.notNull(productPresetVo,
 //                            "未找到商品按件卖的预售价格,productId:"+shopCartMessageVo.getProductId()+"SaleUnitType:"+SaleUnitType.PIECE.getCode());
                     if(productPresetVo == null){
-                        shopCartMessageVo.setPrePrice(0L);
-                        shopCartMessageVo.setPieceWeight(0L);
                         shopCartMessageVo.setProductState(ShopCartMessageProductState.TYPE_CHANGE.getCodeInteger());
                     }else{
                         shopCartMessageVo.setProductState(ShopCartMessageProductState.NORMAL.getCodeInteger());
@@ -139,9 +138,12 @@ public class ShopCartImpl implements IShopCartService {
                         shopCartMessageVo.setSaleUnit(productPresetVo.getSaleUnit());
                         //预设价格分
                         shopCartMessageVo.setPrePrice(productPresetVo.getPrePrice() == null ? 0L : productPresetVo.getPrePrice());
+                        shopCartMessageVo.setUnitAmount(productPresetVo.getPrePrice() == null ? 0L : productPresetVo.getPrePrice());
                         //预设件重克
                         shopCartMessageVo.setPieceWeight(productPresetVo.getPieceWeight());
                     }
+                }else{
+                    shopCartMessageVo.setProductState(ShopCartMessageProductState.NONE.getCodeInteger());
                 }
             });
             //对购物车商品信息集合按修改时间倒序排序
@@ -189,10 +191,12 @@ public class ShopCartImpl implements IShopCartService {
             int in = shopCartMapper.insertSelective(shopCart);
             Assert.isTrue(in > 0, "购物车添加失败");
             shopCartMessageDto.setShopCartId(shopCart.getId());
-            shopCartMessageDto.setCheckFlag(ShopCartMessageCheckFlag.CHECK.getCodeInteger());
             shopCartMessageService.saveShopCartMessage(shopCartMessageDto);
             return;
         }
+        if(checkflag){
+            shopCartMessageDto.setCheckFlag(ShopCartMessageCheckFlag.CHECK.getCodeInteger());
+        }
         //店铺信息存在，判断商品信息是否存在
         ShopCart shopCartQuery = shopCarts.get(0);
         shopCart.setVersion(shopCartQuery.getVersion());
@@ -220,7 +224,7 @@ public class ShopCartImpl implements IShopCartService {
         }
         //存在相同商品信息，对商品信息进行更新操作
         ShopCartMessage shopCartMessageOld = shopCartMessages.get(0);
-        shopCartMessageService.updateByOld(shopCartMessageOld, shopCartDto.getShopCartMessageDto(),shopCartDto.getBo(),checkflag);
+        shopCartMessageService.updateByOld(shopCartMessageOld, shopCartDto.getShopCartMessageDto(),shopCartDto.getBo());
     }
@@ -234,10 +238,13 @@ public class ShopCartImpl implements IShopCartService {
                     ShopCartDto shopCartDto = new ShopCartDto();
                     BeanUtils.copyProperties(shopCartCacheDto, shopCartDto);
                     shopCartMessageDto.setMarketId(shopCartCacheDto.getMarketId());
+                    if(StringUtils.isBlank(shopCartMessageDto.getProductUrl())){
+                        shopCartMessageDto.setProductUrl(shopCartMessageDto.getUrl());
+                    }
                     shopCartDto.setShopCartMessageDto(shopCartMessageDto);
                     return shopCartDto;
                 }).toList();
-                shopCartDtos.forEach(item ->saveShopCart(item,true));
+                shopCartDtos.forEach(item ->saveShopCart(item,false));
             }
         });
     }
@@ -130,16 +130,14 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
      */
     @Transactional
     @Override
-    public void updateByOld(ShopCartMessage shopCartMessageOld, ShopCartMessageDto shopCartMessageDto, Boolean bo,boolean checkflag) {
+    public void updateByOld(ShopCartMessage shopCartMessageOld, ShopCartMessageDto shopCartMessageDto, Boolean bo) {
         AssertUtils.notNull(shopCartMessageOld, "历史购物车商品信息不为空");
         AssertUtils.notNull(shopCartMessageDto, "新增购物车商品信息不为空");
         //获取历史购物车商品
-        AssertUtils.isTrue(shopCartMessageOld.getType().equals(shopCartMessageDto.getType()), "历史购物车商品信息与新增购物车商品信息卖货方式不同");
+        //AssertUtils.isTrue(shopCartMessageOld.getType().equals(shopCartMessageDto.getType()), "历史购物车商品信息与新增购物车商品信息卖货方式不同");
         shopCartMessageDto.setId(shopCartMessageOld.getId());
         shopCartMessageDto.setVersion(shopCartMessageOld.getVersion());
-        if(checkflag){
-            shopCartMessageDto.setCheckFlag(shopCartMessageDto.getCheckFlag());
-        }
+
         //如果是处理离线缓存数据，bo=true,总重量做覆盖，不是处理离线数据，总重量做增量
         if (bo) {
             //如果缓存时间在更新之前之前，说明缓存数据不是最新数据，则不进行更新操作
@@ -3,6 +3,7 @@ package com.diligrp.etrade.order.util;
 import com.diligrp.etrade.core.util.AssertUtils;
 import com.diligrp.etrade.order.domain.ShopCartDto;
 import com.diligrp.etrade.order.domain.ShopCartMessageDto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -52,6 +53,10 @@ public class ShopCartCheckOut {
         AssertUtils.notNull(shopCartMessageDto.getType(), "新增购物车入参：卖货方式不为空");
         checkOutAmount(shopCartMessageDto.getUnitAmount());
         checkOutWeight(shopCartMessageDto.getWeight());
+        //参数转换
+        if(StringUtils.isBlank(shopCartMessageDto.getProductUrl())){
+            shopCartMessageDto.setProductUrl(shopCartMessageDto.getUrl());
+        }
     }
     /**
      *更新购物车入参校验
@@ -30,6 +30,10 @@
             <result column="type" jdbcType="TINYINT" property="type"/>
             <result column="scm_modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
             <result column="check_flag" jdbcType="TINYINT" property="checkFlag"/>
+            <result column="alias" jdbcType="VARCHAR" property="alias"/>
+            <result column="product_name" jdbcType="VARCHAR" property="productName"/>
+            <result column="product_name" jdbcType="VARCHAR" property="productName"/>
+            <result column="prePrice" jdbcType="BIGINT" property="prePrice"/>
         </collection>
     </resultMap>
@@ -56,12 +60,16 @@
                scm.product_id,
                scm.number,
                scm.unit_amount,
+               scm.unit_amount as prePrice,
                scm.unit_weight,
                scm.weight,
                scm.amount,
                scm.type,
                scm.modified_time as scm_modified_time,
-               scm.check_flag as check_flag
+               scm.check_flag as check_flag,
+               scm.product_url as url,
+               scm.product_name as product_name,
+               scm.product_name as alias
         from shop_cart s
                  left join shop_cart_message scm
                            on s.id = scm.shop_cart_id