1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CarrierInfoServiceImpl.java

@@ -299,8 +299,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                                 orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_FINISH.getFlag());
                             }
                             //运费金额=单价 元/吨x装卸净重取小
-                            hyCarrierInfo1.setTotalFreight((hyCarrierInfo.getUnloadingWeight()<hyCarrierInfo.getLoadingWeight()?hyCarrierInfo.getUnloadingWeight():hyCarrierInfo.getLoadingWeight())*orderInfo1.getFreight());
-                            //查询费用信息
+                            orderInfo1.setTotalFreight((hyCarrierInfo.getUnloadingWeight()<hyCarrierInfo.getLoadingWeight()?hyCarrierInfo.getUnloadingWeight():hyCarrierInfo.getLoadingWeight())*orderInfo1.getFreight());
+                            //修改承运表合计应付运费
+                            hyCarrierInfo.setTotalFreight(orderInfo1.getTotalFreight());
+                             //查询费用信息
                             FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
                                     .eq("order_id", orderInfo1.getId()).eq("delete_flag", "0"));
                             //非垫付订单