|
|
@@ -111,7 +111,7 @@ public class ConfirmOrderListener {
|
|
|
//费用按重量计算,数据是g,现在要按kg计算,20是kg单位
|
|
|
Double totalWeight = shopCartOrderDto.getTotalWeight();
|
|
|
Double deliveryWeight = Arith.mul(transport2.getWeight(), 1000);
|
|
|
- transfee=calcDeliveryFee(totalWeight, deliveryWeight, new BigDecimal(transport2.getFreightFee().doubleValue())).doubleValue();
|
|
|
+ transfee = calcDeliveryFee(totalWeight, deliveryWeight, new BigDecimal(transport2.getFreightFee().doubleValue())).doubleValue();
|
|
|
break;
|
|
|
case 2: //夫妻店,B端只走物流
|
|
|
orderParam.setDvyType(DvyType.DELIVERY.value());
|
|
|
@@ -146,7 +146,7 @@ public class ConfirmOrderListener {
|
|
|
shopCartOrderDto.setFreeTransfee(freeTransfee);
|
|
|
}
|
|
|
|
|
|
- public static BigDecimal calcDeliveryFee(Double totalWeight,Double deliveryWeight ,BigDecimal unitFare) {
|
|
|
+ public static BigDecimal calcDeliveryFee(Double totalWeight, Double deliveryWeight, BigDecimal unitFare) {
|
|
|
if (totalWeight == null || totalWeight <= 0 || unitFare == null || unitFare.signum() <= 0) {
|
|
|
return BigDecimal.ZERO;
|
|
|
}
|