运单详情接口，新增运单类型

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDetailResp.java

@@ -171,6 +171,12 @@ public class WaybillOrderDetailResp implements Serializable {
     @Schema(description = "卸货毛重")
     private BigDecimal unloadingGrossAmount;
 
+    /**
+     * 运单类型
+     */
+    @Schema(description = "运单类型")
+    private Integer orderType;
+
     /**
      * 状态
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -4614,23 +4614,26 @@ public class KwtWaybillOrderV1Service {
         KwtWaybillOrderTicket unloadTareAmountTicket = ticketMap.getOrDefault(unloadShipmentTicketKey, new KwtWaybillOrderTicket());
         resp.setUnloadingTareAmount(unloadTareAmountTicket.getTareAmount());
         resp.setUnloadingGrossAmount(unloadTareAmountTicket.getGrossAmount());
+        resp.setOrderType(logOrder.getOrderType());
+
+//        if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())){
+//            BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
+//                    logOrder.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
+//            BigDecimal actualGoodsPrice = Objects.nonNull(contractGoodsDto.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
+//                    contractGoodsDto.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
+//            resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString() +"元");
+//            resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+//        }else if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_2.getValue())){
+//            BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
+//                    logOrder.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
+//            BigDecimal actualGoodsPrice = Objects.nonNull(contractGoodsDto.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
+//                    contractGoodsDto.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
+//            resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+//            resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
+//
+//        }
 
-        if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())){
-            BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
-                    logOrder.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
-            BigDecimal actualGoodsPrice = Objects.nonNull(contractGoodsDto.getPrice()) && Objects.nonNull(subtask.getLoadAmount()) ?
-                    contractGoodsDto.getPrice().multiply(subtask.getLoadAmount()) : BigDecimal.ZERO;
-            resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString() +"元");
-            resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
-        }else if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_2.getValue())){
-            BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
-                    logOrder.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
-            BigDecimal actualGoodsPrice = Objects.nonNull(contractGoodsDto.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
-                    contractGoodsDto.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
-            resp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
-            resp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString()+"元");
 
-        }
         resp.setTruckNo(billOrder.getTruckNo());
         resp.setCarAxis(truck != null ? truck.getCarAxis() : "");
         resp.setFleetName(fleet != null ? fleet.getName() : "");