20220810

xiaoyong931011

2022-08-19 1f2cd199b67e312094979653598ebc3093c390bb

20220810

 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;


 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);