From 1f2cd199b67e312094979653598ebc3093c390bb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Aug 2022 11:00:39 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java | 4 ++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
index 71fe23b..c3bb84e 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
@@ -5,6 +5,7 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -34,6 +35,9 @@
@ApiModelProperty(value = "备注")
private String remark;
+ @ApiModelProperty(value = "配送费")
+ private BigDecimal deliveryAmount;
+
@ApiModelProperty(value = "1-普通订单/2-积分订单")
private Integer orderType;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 616e4c3..7d353a1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -180,7 +180,11 @@
}
mallOrderItemMapper.insert(orderItem);
}
-
+ //配送费
+ BigDecimal delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount();
+ if(BigDecimal.ZERO.compareTo(delivaryAmount) < 0 && 1 == addOrderDto.getIsHome()){
+ total = total.add(delivaryAmount);
+ }
orderInfo.setAmount(total);
orderInfo.setCarriage(carriage);
--
Gitblit v1.9.1