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