update:增加运输费

fengliang
1 parent b8b53e1d
Showing 6 changed files with 44 additions and 1 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderCreateDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/Order.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/OrderPayment.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/OrderPaymenServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
 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;
@@ -143,6 +144,9 @@ public class OrderCreateDto{
     @Valid
     private OrderDeliveryDto delivery;
+    /** 配送费用 */
+    private BigDecimal transportFee = NumberTransform.ZERO;
+
     public Integer getAchieveType() {
         return achieveType;
     }
@@ -438,4 +442,12 @@ public class OrderCreateDto{
     public void setDelivery(OrderDeliveryDto delivery) {
         this.delivery = delivery;
     }
+
+    public BigDecimal getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(BigDecimal transportFee) {
+        this.transportFee = transportFee;
+    }
 }
@@ -279,6 +279,9 @@ public class Order {
     /** 订单配送状态 */
     private Integer achieveState;
+    /** 运费 */
+    private Long transportFee;
+
     public Integer getAchieveType() {
         return achieveType;
     }
@@ -734,4 +737,12 @@ public class Order {
     public void setRelationId(Long relationId) {
         this.relationId = relationId;
     }
+
+    public Long getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(Long transportFee) {
+        this.transportFee = transportFee;
+    }
 }
 \ No newline at end of file
@@ -87,6 +87,11 @@ public class OrderPayment {
      */
     private Long relationId;
+    /**
+     * 运费
+     */
+    private Long transportFee;
+
     public Long getTotleSellerFee() {
         return totleSellerFee;
     }
@@ -344,4 +349,12 @@ public class OrderPayment {
     public void setRelationId(Long relationId) {
         this.relationId = relationId;
     }
+
+    public Long getTransportFee() {
+        return transportFee;
+    }
+
+    public void setTransportFee(Long transportFee) {
+        this.transportFee = transportFee;
+    }
 }
 \ No newline at end of file
@@ -185,7 +185,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 waitCouponAmount = waitCouponAmount.subtract(couponAmount);
             }
         }
-
+        //配送情况增加计算运费
+        if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
+            allmount.add(buyerOrderDto.getTransportFee());
+        }
         //效验库存
         for(Long key:validateStockMap.keySet()){
             ProductCheckDto productDtotemp = validateStockMap.get(key);
@@ -394,6 +394,7 @@ public class OrderPaymenServiceImpl implements OrderPaymentService {
         }else{
             orderPayment = new OrderPayment();
         }
+        orderPayment.setTransportFee(order.getTransportFee());
         orderPayment.setMarketId(order.getMarketId());
         orderPayment.setOrderId(order.getId());
         orderPayment.setOrderCode(order.getCode());
@@ -1135,6 +1135,9 @@ public class OrderServiceImpl implements OrderService {
         order.setTotleAmount(buyerOrderDto.getTotleAmount().multiply(new BigDecimal(100)).longValue());
         order.setTotleDiscount(buyerOrderDto.getTotleDiscount().multiply(new BigDecimal(100)).longValue());
         order.setTotleWeight(buyerOrderDto.getTotleWeight().multiply(new BigDecimal(500)).longValue());
+        if(buyerOrderDto.getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())&&buyerOrderDto.getTransportFee()!=null){
+            order.setTransportFee(buyerOrderDto.getTransportFee().multiply(new BigDecimal(100)).longValue());
+        }
         order.setTotlePaidAmount(0L);
         order.setTotlePayAmount(buyerOrderDto.getTotlePayAmount().multiply(new BigDecimal(100)).longValue());
         order.setPayState(OrderPayState.WAIT_PAY.getCodeInteger());