update:多店铺运费只分配第一家

fengliang
1 parent 2816a4b2
Showing 7 changed files with 42 additions and 17 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/MultipleOrderDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderCreateDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderGoodsService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
@@ -100,7 +100,7 @@ public class OrderController {
                 token.delete();
                 return Message.failure(OrderErrorCode.ORDER_CREATE_FINISH,"订单已创建成功");
             }
-            order = orderService.createOrder(buyerOrderDto, OrderOrderType.BUYER_ORDER.getCodeInteger());
+            order = orderService.createOrder(buyerOrderDto, OrderOrderType.BUYER_ORDER.getCodeInteger(),true);
             token.set(OrderState.WAIT_PAY.getCodeInteger(), Duration.ofSeconds(OrderConstant.TokenOutTimeSecond));
         }finally {
             lock.unlock();
 package com.diligrp.etrade.order.domain;
+import com.diligrp.etrade.order.util.NumberTransform;
 import com.diligrp.etrade.shop.domain.response.ShopVo;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Min;
@@ -116,6 +117,9 @@ public class MultipleOrderDto {
     @Valid
     private OrderDeliveryDto delivery;
+    /** 配送费用 */
+    private BigDecimal transportFee = NumberTransform.ZERO;
+
     public Integer getAchieveType() {
         return achieveType;
     }
@@ -349,4 +353,12 @@ public class MultipleOrderDto {
     public void setDelivery(OrderDeliveryDto delivery) {
         this.delivery = delivery;
     }
+
+    public BigDecimal getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(BigDecimal transportFee) {
+        this.transportFee = transportFee;
+    }
 }
@@ -304,7 +304,7 @@ public class OrderCreateDto{
     }
     public void setTotlePayAmount(BigDecimal totlePayAmount) {
-        this.totlePayAmount = totlePayAmount!=null?totlePayAmount.setScale(2, RoundingMode.HALF_UP):null;
+        this.totlePayAmount = totlePayAmount!=null?totlePayAmount.setScale(2, RoundingMode.HALF_UP):BigDecimal.ZERO;
     }
     public BigDecimal getTotleDiscount() {
@@ -312,7 +312,7 @@ public class OrderCreateDto{
     }
     public void setTotleDiscount(BigDecimal totleDiscount) {
-        this.totleDiscount = totleDiscount!=null?totleDiscount.setScale(2, RoundingMode.HALF_UP):null;
+        this.totleDiscount = totleDiscount!=null?totleDiscount.setScale(2, RoundingMode.HALF_UP):BigDecimal.ZERO;
     }
     public BigDecimal getTotleWeight() {
@@ -320,7 +320,7 @@ public class OrderCreateDto{
     }
     public void setTotleWeight(BigDecimal totleWeight) {
-        this.totleWeight = totleWeight!=null?totleWeight.setScale(2, RoundingMode.HALF_UP):null;
+        this.totleWeight = totleWeight!=null?totleWeight.setScale(2, RoundingMode.HALF_UP):BigDecimal.ZERO;
     }
     public Long getCreaterId() {
@@ -448,6 +448,6 @@ public class OrderCreateDto{
     }
     public void setTransportFee(BigDecimal transportFee) {
-        this.transportFee = transportFee;
+        this.transportFee = transportFee!=null?transportFee.setScale(2, RoundingMode.HALF_UP):BigDecimal.ZERO;
     }
 }
@@ -27,7 +27,7 @@ public interface OrderGoodsService {
      * @param buyerOrderDto 入参
      * @param orderType 入口类型
      */
-    void checkBuyerOrderDto(OrderCreateDto buyerOrderDto, Integer orderType);
+    void checkBuyerOrderDto(OrderCreateDto buyerOrderDto, Integer orderType,Boolean transportFeeFlag);
     /**
      * 修改时禁用已经生成的订单商品
@@ -19,7 +19,7 @@ public interface OrderService {
      * @param orderBuyerDto
      * @param orderType 身份类型
      */
-    Order createOrder(OrderCreateDto orderBuyerDto, Integer orderType);
+    Order createOrder(OrderCreateDto orderBuyerDto, Integer orderType,Boolean transportFeeFlag);
     /**
      * 创建或更新订单
@@ -102,7 +102,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
     @Override
-    public void checkBuyerOrderDto(OrderCreateDto buyerOrderDto, Integer orderType) {
+    public void checkBuyerOrderDto(OrderCreateDto buyerOrderDto, Integer orderType,Boolean transportFeeFlag) {
         BigDecimal allmount = new BigDecimal(0).setScale(2, RoundingMode.HALF_UP);
         BigDecimal allWeight = new BigDecimal(0).setScale(2,RoundingMode.HALF_UP);
         BigDecimal waitCouponAmount = new BigDecimal(0).add(buyerOrderDto.getTotleDiscount());
@@ -162,12 +162,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             }
         }
         //配送情况增加计算运费
-        if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
+        if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())&&transportFeeFlag){
             ConfigQueryDto query = new ConfigQueryDto();
             query.setName("甄选运费");
             query.setMarketId(buyerOrderDto.getMarketId());
             BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
-            Long transportFee = buyerOrderDto.getTransportFee().longValue()*100;
+            Long transportFee = buyerOrderDto.getTransportFee().multiply(NumberTransform.ONE_HUNDERD).longValue();
             Long transportFeeConfig = 0L;
             if("200".equals(listBaseOutput.getCode())){
                 List<ConfigDto> configDtos = listBaseOutput.getData();
@@ -25,7 +25,9 @@ import com.diligrp.etrade.order.util.NumberTransform;
 import com.diligrp.etrade.rpc.CustomerRpc;
 import com.diligrp.etrade.rpc.UapRpc;
 import com.diligrp.etrade.rpc.UidRpc;
+import com.diligrp.etrade.rpc.basicdata.BasicDataConfigRpc;
 import com.diligrp.etrade.rpc.dto.*;
+import com.diligrp.etrade.rpc.dto.request.ConfigQueryDto;
 import com.diligrp.etrade.rpc.dto.response.*;
 import com.diligrp.etrade.rpc.resolver.PayRpcResolver;
 import com.diligrp.etrade.rpc.dto.response.BalanceResponseDto;
@@ -118,9 +120,12 @@ public class OrderServiceImpl implements OrderService {
     @Resource
     private OrderDeliveryService orderDeliveryService;
+    @Resource
+    private BasicDataConfigRpc basicDataConfigRpc;
+
     @Transactional
     @Override
-    public Order createOrder(OrderCreateDto orderCreateDto, Integer orderType) {
+    public Order createOrder(OrderCreateDto orderCreateDto, Integer orderType,Boolean transportFeeFlag) {
         //效验店铺状态
         ShopVo shop = orderGoodsService.checkShop(orderCreateDto.getShopId());
         //效验买方状态
@@ -133,7 +138,7 @@ public class OrderServiceImpl implements OrderService {
         orderCreateDto.setShopName(shop.getName());
         orderCreateDto.setShopCustomerName(shop.getCustomerName());
         //验证订单商品总重量与订单商品总价格
-        orderGoodsService.checkBuyerOrderDto(orderCreateDto,orderType);
+        orderGoodsService.checkBuyerOrderDto(orderCreateDto,orderType,transportFeeFlag);
         //创建订单
         Order order = new Order();
         orderCreateDto.setShop(shop);
@@ -177,7 +182,7 @@ public class OrderServiceImpl implements OrderService {
         orderCreateDto.setShopName(shop.getName());
         orderCreateDto.setShopCustomerName(shop.getCustomerName());
         //验证订单商品总重量与订单商品总价格
-        orderGoodsService.checkBuyerOrderDto(orderCreateDto,identityType);
+        orderGoodsService.checkBuyerOrderDto(orderCreateDto,identityType,true);
         //创建订单
         Order order = new Order();
         orderCreateDto.setShop(shop);
@@ -410,7 +415,7 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void updateOrder(OrderCreateDto buyerOrderDto, Integer orderType) {
         //验证订单商品总重量与订单商品总价格
-        orderGoodsService.checkBuyerOrderDto(buyerOrderDto,orderType);
+        orderGoodsService.checkBuyerOrderDto(buyerOrderDto,orderType,true);
         //获取原始订单
         Order order = getOrderAndCheckState(null, buyerOrderDto.getCode(), buyerOrderDto.getMarketId(),OrderOrderState.SELLER_FIX,buyerOrderDto);
         //判断修改人
@@ -442,7 +447,7 @@ public class OrderServiceImpl implements OrderService {
         //获取订单并效验状态
         Order order = getOrderAndCheckState(null, buyerOrderDto.getCode(), buyerOrderDto.getMarketId(),OrderOrderState.SELLER_FIX,buyerOrderDto);
         //验证订单商品总重量与订单商品总价格
-        orderGoodsService.checkBuyerOrderDto(buyerOrderDto,orderType);
+        orderGoodsService.checkBuyerOrderDto(buyerOrderDto,orderType,true);
         //判断卖方修改人是否有权限修改订单
         if(buyerOrderDto.getModifierId() == null || StrUtil.isEmpty(buyerOrderDto.getModifier())){
             throw new OrderException(OrderErrorCode.PARAM_ERROR,"订单修改人信息未传");
@@ -1381,9 +1386,17 @@ public class OrderServiceImpl implements OrderService {
     public List<Order> createMultipleOrder(MultipleOrderDto multipleOrderDto, Integer codeInteger) {
         List<Order> orders = new ArrayList<>();
         Map<Long,OrderCreateDto> orderCreateDtos =  buildOrdersDto(multipleOrderDto);
+        boolean first = true;
         for(Long shopId :orderCreateDtos.keySet()){
-            Order order = this.createOrder(orderCreateDtos.get(shopId), OrderOrderType.BUYER_ORDER.getCodeInteger());
-            orders.add(order);
+            if(first){
+                first = false;
+                orderCreateDtos.get(shopId).setTransportFee(multipleOrderDto.getTransportFee());
+                Order order = this.createOrder(orderCreateDtos.get(shopId), OrderOrderType.BUYER_ORDER.getCodeInteger(),true);
+                orders.add(order);
+            }else{
+                Order order = this.createOrder(orderCreateDtos.get(shopId), OrderOrderType.BUYER_ORDER.getCodeInteger(),false);
+                orders.add(order);
+            }
         }
         return orders;
     }