运单详情增加结算信息相关字段

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -181,4 +181,20 @@ public class OrderChildVO {
     @ApiModelProperty("最晚装货时间")
     private String lastLoadTime;
 
+
+    //结算信息
+    @ApiModelProperty(value = "实际运费", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal realFreight;
+    @ApiModelProperty(value = "货损金额", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossFreight;
+    @ApiModelProperty(value = "预付运费金额", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal prepayFreight;
+    @ApiModelProperty(value = "结算金额", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal settlementFreight;
+
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -12,6 +12,7 @@ import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.OrderChildExpectDTO;
 import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.dto.payment.WalletResidueCardDTO;
@@ -21,6 +22,7 @@ import com.clx.performance.extranal.user.*;
 import com.clx.performance.feign.FeignPaymentService;
 import com.clx.performance.model.*;
 import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
@@ -163,6 +165,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    SettlementOwnerDetailDao settlementOwnerDetailDao;
+
 
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
@@ -1311,6 +1316,18 @@ public class OrderChildServiceImpl implements OrderChildService {
             result.setReceiveAddressInfo(addressStruct.convert(sendAndReceiveAddress.get().getReceiveAddress()));
         }
 
+
+        //查询结算信息
+        Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
+        if(!optional.isPresent()){
+            SettlementOwnerDetail settlementOwnerDetail = optional.get();
+            result.setRealFreight(settlementOwnerDetail.getFreight());
+            result.setLossFreight(settlementOwnerDetail.getLossFreight());
+            result.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
+            result.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
+        }
+
+
         return result;
     }