update:效验购物车

fengliang
1 parent b995977e
Showing 6 changed files with 85 additions and 2 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/dao/ShopCartMessageMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ProductDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/IShopCartMessageService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.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/ShopCartMessageMapper.xml
@@ -38,4 +38,7 @@ public interface ShopCartMessageMapper extends MybatisMapperSupport {
      * @return
      */
     List<Long> findCartIdByMessageIds(ShopCartDto shopCartDto);
+
+    /** 查询并锁定数据 */
+    List<ShopCartMessage> selectAndLockByIds(List<Long> messages);
 }
 \ No newline at end of file
@@ -72,6 +72,9 @@ public class ProductDto {
  
     private String productUnit;
  
+    /** 购物车商品Id */
+    private Long shopCertMessageId;
+
     public String getCode() {
         return code;
     }
@@ -231,4 +234,12 @@ public class ProductDto {
     public void setProductUnit(String productUnit) {
         this.productUnit = productUnit;
     }
+
+    public Long getShopCertMessageId() {
+        return shopCertMessageId;
+    }
+
+    public void setShopCertMessageId(Long shopCertMessageId) {
+        this.shopCertMessageId = shopCertMessageId;
+    }
 }
@@ -31,4 +31,7 @@ public interface IShopCartMessageService {
      * @return
      */
     List<Long> findCartIdByMessageIds(ShopCartDto shopCartDto);
+
+    /** 查询并上锁 */
+    List<ShopCartMessage> selectByIds(List<Long> messages);
 }
@@ -62,6 +62,7 @@ import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
  
 /**
  * 订单主单服务实现
@@ -123,6 +124,12 @@ public class OrderServiceImpl implements OrderService {
     @Resource
     private BasicDataConfigRpc basicDataConfigRpc;
  
+    @Resource
+    private IShopCartMessageService shopCartMessageService;
+
+    @Resource
+    private IShopCartService shopCartService;
+
     @Transactional
     @Override
     public Order createOrder(OrderCreateDto orderCreateDto, Integer orderType,Boolean transportFeeFlag) {
@@ -1385,7 +1392,18 @@ public class OrderServiceImpl implements OrderService {
     @Transactional(rollbackFor = Exception.class)
     public List<Order> createMultipleOrder(MultipleOrderDto multipleOrderDto, Integer codeInteger) {
         List<Order> orders = new ArrayList<>();
-        Map<Long,OrderCreateDto> orderCreateDtos =  buildOrdersDto(multipleOrderDto);
+        //检测购物车是否存在数据
+        List<Long> messages = multipleOrderDto.getProductDtoList().stream().map(ProductDto::getShopCertMessageId).toList();
+        List<ShopCartMessage> shopCartMessagesIds = shopCartMessageService.selectByIds(messages);
+        if(shopCartMessagesIds != null){
+            Integer size = shopCartMessagesIds.size();
+            if(!size.equals(messages.size())){
+                throw new OrderException(OrderErrorCode.PARAM_ERROR,"购物车数据已变更请刷新后重试");
+            }
+        }else{
+            throw new OrderException(OrderErrorCode.PARAM_ERROR,"购物车数据已变更请刷新后重试");
+        }
+        Map<Long,OrderCreateDto> orderCreateDtos =  buildOrdersDto(multipleOrderDto,shopCartMessagesIds);
         boolean first = true;
         for(Long shopId :orderCreateDtos.keySet()){
             if(first){
@@ -1398,6 +1416,9 @@ public class OrderServiceImpl implements OrderService {
                 orders.add(order);
             }
         }
+        ShopCartDto shopCartDto = new ShopCartDto();
+        shopCartDto.setIds(messages);
+        shopCartService.deleteShopCartMessageList(shopCartDto);
         return orders;
     }
  
@@ -1497,11 +1518,19 @@ public class OrderServiceImpl implements OrderService {
      * @param multipleOrderDto
      * @return
      */
-    private Map<Long,OrderCreateDto> buildOrdersDto(MultipleOrderDto multipleOrderDto) {
+    private Map<Long,OrderCreateDto> buildOrdersDto(MultipleOrderDto multipleOrderDto,List<ShopCartMessage> messages) {
         Map<Long,OrderCreateDto> orderCreateDtoMap = new HashMap<>();
         BigDecimal totleAmount = new BigDecimal(0).setScale(2, RoundingMode.HALF_UP);
         Long tempShopid = 0L;
         for (ProductDto productDto : multipleOrderDto.getProductDtoList()){
+            for(ShopCartMessage shopCartMessage : messages){
+                if(shopCartMessage.getId().equals(productDto.getShopCertMessageId())){
+                    Long wight= productDto.getProductWeight().multiply(NumberTransform.ONE_HUNDERD).longValue();
+                    if(wight.equals(shopCartMessage.getWeight())){
+                        throw new OrderException(OrderErrorCode.PARAM_ERROR,productDto.getProductName()+"的数量已发生变更,请刷新后重试");
+                    }
+                }
+            }
             OrderCreateDto orderCreateDto = orderCreateDtoMap.get(productDto.getShopId());
             if(orderCreateDto == null){
                 orderCreateDto = new OrderCreateDto();
@@ -1535,6 +1564,26 @@ public class OrderServiceImpl implements OrderService {
  
             tempShopid = productDto.getShopId();
         }
+        //配送情况增加计算运费
+        if(multipleOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
+            ConfigQueryDto query = new ConfigQueryDto();
+            query.setType("TransportFee");
+            query.setMarketId(multipleOrderDto.getMarketId());
+            BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
+            Long transportFee = multipleOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue();
+            Long transportFeeConfig = 0L;
+            if("200".equals(listBaseOutput.getCode())){
+                List<ConfigDto> configDtos = listBaseOutput.getData();
+                if(configDtos!=null&&configDtos.size()>0) {
+                    ConfigDto configDto = configDtos.get(0);
+                    transportFeeConfig = Long.parseLong(configDto.getValue());
+                }
+            }
+            if(!transportFee.equals(transportFeeConfig)){
+                throw new OrderException(OrderErrorCode.PARAM_ERROR,"运费与设置不一致，请刷新后重试");
+            }
+            totleAmount.add(multipleOrderDto.getTransportFee());
+        }
         //订单总价，与订单总重效验
         if(!(multipleOrderDto.getTotleAmount().compareTo(totleAmount)==0)){
             throw new OrderException(OrderErrorCode.PARAM_ERROR,"商品交易总价计算异常");
@@ -201,4 +201,9 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
     public List<Long> findCartIdByMessageIds(ShopCartDto shopCartDto) {
         return shopCartMessageMapper.findCartIdByMessageIds(shopCartDto);
     }
+
+    @Override
+    public List<ShopCartMessage> selectByIds(List<Long> messages) {
+        return shopCartMessageMapper.selectAndLockByIds(messages);
+    }
 }
@@ -104,6 +104,18 @@
         </where>
         group by shop_cart_id
     </select>
+    <select id="selectAndLockByIds" resultType="com.diligrp.etrade.order.model.ShopCartMessage">
+        select
+            id,shop_cart_id,market_id,product_id,weight,`type`,product_name
+        from shop_cart_message
+        <where>
+            id in
+            <foreach collection="ids" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+        for update
+    </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete
         from shop_cart_message