update:修改购物车商品添加的类型

fengliang
1 parent efbc08cb
Showing 3 changed files with 15 additions and 76 deletions
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
@@ -14,7 +14,6 @@ import com.diligrp.etrade.order.model.ShopCart;
 import com.diligrp.etrade.order.model.ShopCartMessage;
 import com.diligrp.etrade.order.service.IShopCartMessageService;
 import com.diligrp.etrade.order.service.IShopCartService;
-import com.diligrp.etrade.order.type.ProductTradeType;
 import com.diligrp.etrade.order.type.ShopCartMessageProductState;
 import com.diligrp.etrade.shop.domain.response.ProductListVo;
 import com.diligrp.etrade.shop.domain.response.ProductPresetVo;
@@ -174,17 +173,10 @@ public class ShopCartImpl implements IShopCartService {
         //构建商品信息
         shopCartMessageDto.setCreater(shopCartDto.getCustomerName());
         Long unitAmount = shopCartMessageDto.getUnitAmount();
-        //按件卖，计算合计 单价*(件数的100倍/100)
-        if (ProductTradeType.PIECES_TYPE.getCodeInteger().equals(shopCartMessageDto.getType())) {
-            Long number = shopCartMessageDto.getNumber();
-            Long amount = MoneyUtil.getAmountByNumber(unitAmount, number);
-            shopCartMessageDto.setAmount(amount);
-        } else {
-            //按斤卖 小计=单价(分/斤)*重量(克)/500
-            Long weight = shopCartMessageDto.getWeight();
-            Long amount = MoneyUtil.getAmountByWeight(unitAmount, weight);
-            shopCartMessageDto.setAmount(amount);
-        }
+        //按单位卖 小计=单价(分/斤)*重量(克)/500
+        Long weight = shopCartMessageDto.getWeight();
+        Long amount = MoneyUtil.getAmountByWeight(unitAmount, weight);
+        shopCartMessageDto.setAmount(amount);
         //没有店铺信息，则对购物车与购物车商品信息进行新增操作
         if (CollectionUtils.isEmpty(shopCarts)) {
@@ -7,7 +7,6 @@ import com.diligrp.etrade.order.domain.ShopCartDto;
 import com.diligrp.etrade.order.domain.ShopCartMessageDto;
 import com.diligrp.etrade.order.model.ShopCartMessage;
 import com.diligrp.etrade.order.service.IShopCartMessageService;
-import com.diligrp.etrade.order.type.ProductTradeType;
 import jakarta.annotation.Resource;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -60,17 +59,8 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
         AssertUtils.notNull(shopCartMessageDto, "购物车商品不为空");
         ShopCartMessage shopCartMessage = new ShopCartMessage();
         BeanUtils.copyProperties(shopCartMessageDto, shopCartMessage);
-        //组装小计
-        //按件卖时，小计=单价*件重100倍/100
-        if (ProductTradeType.PIECES_TYPE.getCodeInteger().equals(shopCartMessage.getType())) {
-            Long amount = MoneyUtil.getAmountByNumber(shopCartMessage.getUnitAmount(), shopCartMessage.getNumber());
-            shopCartMessage.setAmount(amount);
-        }
-        //按斤卖时，小计=单价*总重(克)/500
-        if (ProductTradeType.WEIGHT_TYPE.getCodeInteger().equals(shopCartMessage.getType())) {
-            Long amount = MoneyUtil.getAmountByWeight(shopCartMessage.getUnitAmount(), shopCartMessage.getWeight());
-            shopCartMessage.setAmount(amount);
-        }
+        Long amount = MoneyUtil.getAmountByWeight(shopCartMessage.getUnitAmount(), shopCartMessage.getWeight());
+        shopCartMessage.setAmount(amount);
         int i = shopCartMessageMapper.insertSelective(shopCartMessage);
         AssertUtils.isTrue(i > 0, "商品信息存储失败");
     }
@@ -108,23 +98,11 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
         ShopCartMessage shopCartMessage = shopCartMessageList.get(0);
         ShopCartMessageDto shopCartMessageDtoNew = new ShopCartMessageDto();
         BeanUtils.copyProperties(shopCartMessage, shopCartMessageDtoNew);
-        //按件卖
-        if (ProductTradeType.PIECES_TYPE.getCodeInteger().equals(shopCartMessageDto.getType())) {
-            Long number = shopCartMessageDto.getNumber() + shopCartMessage.getNumber();
-            Long amount = MoneyUtil.getAmountByNumber(shopCartMessageDto.getUnitAmount(), number);
-            shopCartMessageDtoNew.setAmount(amount);
-            shopCartMessageDtoNew.setUnitAmount(shopCartMessageDto.getUnitAmount());
-            shopCartMessageDtoNew.setNumber(number);
-            shopCartMessageDtoNew.setUnitWeight(shopCartMessageDto.getUnitWeight());
-        }
-        //按斤卖时，小计(分/斤)=单价(分/斤)*总重(克)/500
-        if (ProductTradeType.WEIGHT_TYPE.getCodeInteger().equals(shopCartMessageDto.getType())) {
-            Long weight = shopCartMessageDto.getWeight() + shopCartMessage.getWeight();
-            Long amount = MoneyUtil.getAmountByWeight(shopCartMessageDto.getUnitAmount(), weight);
-            shopCartMessageDtoNew.setAmount(amount);
-            shopCartMessageDtoNew.setWeight(weight);
-            shopCartMessageDtoNew.setUnitAmount(shopCartMessageDto.getUnitAmount());
-        }
+        Long weight = shopCartMessageDto.getWeight() + shopCartMessage.getWeight();
+        Long amount = MoneyUtil.getAmountByWeight(shopCartMessageDto.getUnitAmount(), weight);
+        shopCartMessageDtoNew.setAmount(amount);
+        shopCartMessageDtoNew.setWeight(weight);
+        shopCartMessageDtoNew.setUnitAmount(shopCartMessageDto.getUnitAmount());
         int i = shopCartMessageMapper.updateByPrimaryKeySelective(shopCartMessageDtoNew);
         int j = shopCartMessageMapper.deleteByPrimaryKey(shopCartMessageQuery.getId());
         AssertUtils.isTrue(i > 0 && j > 0, "商品信息更新失败");
@@ -136,19 +114,10 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
      * @author wujunrui
      */
     public void updateShopCartMessageOne(ShopCartMessageDto shopCartMessageDto) {
-        //按件卖时，小计(分/件)=单价(分/件)*件数(100倍件数)/100
-        if (ProductTradeType.PIECES_TYPE.getCodeInteger().equals(shopCartMessageDto.getType())) {
-            Long amount = MoneyUtil.getAmountByNumber(shopCartMessageDto.getUnitAmount(), shopCartMessageDto.getNumber());
-            shopCartMessageDto.setAmount(amount);
-            shopCartMessageDto.setWeight(0L);
-        }
-        //按斤卖时，小计(分/斤)=单价(分/斤)*总重(克)/500
-        if (ProductTradeType.WEIGHT_TYPE.getCodeInteger().equals(shopCartMessageDto.getType())) {
-            Long amount = MoneyUtil.getAmountByWeight(shopCartMessageDto.getUnitAmount(), shopCartMessageDto.getWeight());
-            shopCartMessageDto.setAmount(amount);
-            shopCartMessageDto.setUnitWeight(0L);
-            shopCartMessageDto.setNumber(0L);
-        }
+        Long amount = MoneyUtil.getAmountByWeight(shopCartMessageDto.getUnitAmount(), shopCartMessageDto.getWeight());
+        shopCartMessageDto.setAmount(amount);
+        shopCartMessageDto.setUnitWeight(0L);
+        shopCartMessageDto.setNumber(0L);
         int i = shopCartMessageMapper.updateByPrimaryKeySelective(shopCartMessageDto);
         AssertUtils.isTrue(i > 0, "商品信息更新失败");
     }
@@ -168,27 +137,6 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
         AssertUtils.isTrue(shopCartMessageOld.getType().equals(shopCartMessageDto.getType()), "历史购物车商品信息与新增购物车商品信息卖货方式不同");
         shopCartMessageDto.setId(shopCartMessageOld.getId());
         shopCartMessageDto.setVersion(shopCartMessageOld.getVersion());
-        //按件卖
-        if (ProductTradeType.PIECES_TYPE.getCodeInteger().equals(shopCartMessageOld.getType())) {
-            //如果是处理离线缓存数据，bo=true,件数做覆盖,如果不是处理离线数据，件数做增量
-
-            if (bo) {
-                //如果缓存时间在更新之前之前，说明缓存数据不是最新数据，则不进行更新操作
-                if (shopCartMessageDto.getCacheTime().isBefore(shopCartMessageOld.getModifiedTime())) {
-                    return;
-                }
-            }else {
-                //件数做增量
-                shopCartMessageDto.setNumber(shopCartMessageDto.getNumber() + shopCartMessageOld.getNumber());
-            }
-            //小计(因件数扩大了100倍，金额需/100)
-            Long amount = MoneyUtil.getAmountByNumber(shopCartMessageDto.getUnitAmount(), shopCartMessageDto.getNumber());
-            shopCartMessageDto.setAmount(amount);
-            int i = shopCartMessageMapper.updateByPrimaryKeySelective(shopCartMessageDto);
-            AssertUtils.isTrue(i > 0, "更新购物车商品信息失败");
-            return;
-        }
-        //按重量卖
         //如果是处理离线缓存数据，bo=true,总重量做覆盖，不是处理离线数据，总重量做增量
         if (bo) {
             //如果缓存时间在更新之前之前，说明缓存数据不是最新数据，则不进行更新操作
@@ -3,7 +3,6 @@ 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 com.diligrp.etrade.order.type.ProductTradeType;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;