已驳回的运单信息在app端修改无效

删除地址信息后派车报错
物流订单按桥运里程运价展示调整

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticsOrderDto.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author lfdc

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

@@ -147,6 +147,8 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
      */
     private BigDecimal price;
 
+    private List<String> prices;
+
     /**
      * 运价
      */

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

@@ -12,6 +12,7 @@ import com.github.pagehelper.PageInfo;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.StringConstant;
+import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
@@ -171,6 +172,9 @@ public class KwtAcceptCarriageOrderService {
 
     private final RedisLockUtil redisLockUtil;
 
+    @Autowired
+    public KwtLogisticsOrderLineFreightRateMapper lineFreightRateMapper;
+
 
     /**
      * 承运订单-分包托运
@@ -2540,7 +2544,23 @@ public class KwtAcceptCarriageOrderService {
             }
         }
 
+
+        List<AcceptCarriageOrderVO> collect = list.stream().filter(item -> item.getBillingMode().equals(DictEnum.CHARGING_TYPE_4.getValue())).collect(Collectors.toList());
+        Map<Long, List<KwtLogisticsOrderLineFreightRate>> collect1 = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(collect)) {
+            List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = lineFreightRateMapper.selectListByOrderIdList(collect.stream().map(AcceptCarriageOrderVO::getLOrderId).map(Long::parseLong).toList());
+            if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
+                collect1 = kwtLogisticsOrderLineFreightRates.stream().collect(Collectors.groupingBy(KwtLogisticsOrderLineFreightRate::getLOrderId));
+            }
+        }
+
         for (AcceptCarriageOrderVO vo : list) {
+
+            List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = collect1.get(Long.parseLong(vo.getLOrderId()));
+            if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
+                vo.setPrices(kwtLogisticsOrderLineFreightRates.stream().map(item -> item.getName() + " " + item.getTransportPrice()).toList());
+            }
+
             vo.setAccountsCycleLabel(settlementDictData.get(vo.getAccountsCycle()));
             vo.setAppointor(longUserMap.get(vo.getCreateBy()) == null ? null : longUserMap.get(vo.getCreateBy()).getName());
             vo.setBillingModeLabel(chargingDictData.get(vo.getBillingMode()));

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

@@ -1876,7 +1876,6 @@ public class KwtWaybillOrderV1Service {
      **/
     @Transactional(rollbackFor = Exception.class)
     public HttpResult editTicketV2(List<WaybillOrderEditTicketDto> params) {
-        log.info("params:{}", JSON.toJSONString(params));
         /*1、校验*/
         for (WaybillOrderEditTicketDto ticketDto : params) {
             Long wTicketId = ticketDto.getWTicketId();
@@ -1913,13 +1912,11 @@ public class KwtWaybillOrderV1Service {
             /*2、更新装卸货榜单信息*/
             //榜单信息
             List<WaybillOrderTicketLoadingDto> loading = ticketDto.getLoading();
-            log.info("loading:{}", JSON.toJSONString(loading));
             waybillOrderTicketService.editTicketV1(loading, ticket.getWAddressId(), ticketDto.getUrls(), ticketDto.getOperateTime());
 
             /*3、更新车辆运单-子单*/
             //运单子单信息
             KwtWaybillOrderSubtask orderSubtask = waybillOrderSubtaskDao.selectById(ticket.getWSubtaskId());
-            log.info("orderSubtask:{}", JSON.toJSONString(orderSubtask));
 
             //物流运单信息
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(orderSubtask.getLOrderId());
@@ -1938,7 +1935,6 @@ public class KwtWaybillOrderV1Service {
                     logisticsOrder.getLoss(), logisticsOrder.getLossUnit(), logisticsOrder.getGoodsPrice());
             orderSubtask.setDeficitPrice(deficitPrice);
             waybillOrderSubtaskDao.updateById(orderSubtask);
-            log.info("neworderSubtask:{}", JSON.toJSONString(orderSubtask));
         }
 
         /*4、更新车辆运单子单状态*/

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/operateService/KwtManagementLogisticsOrderService.java

@@ -101,6 +101,8 @@ public class KwtManagementLogisticsOrderService {
 
     @Autowired
     public KwtWaybillOrderTrackMapper waybillOrderTrackMapper;
+    @Autowired
+    public KwtLogisticsOrderLineFreightRateMapper lineFreightRateMapper;
 
     /**
      * @param query
@@ -196,7 +198,21 @@ public class KwtManagementLogisticsOrderService {
             }
         }
 
+        List<ManagementLogisticsOrderVO> collect = list.stream().filter(item -> item.getBillingMode().equals(DictEnum.CHARGING_TYPE_4.getValue())).collect(Collectors.toList());
+        Map<Long, List<KwtLogisticsOrderLineFreightRate>> collect1 = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(collect)) {
+            List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = lineFreightRateMapper.selectListByOrderIdList(collect.stream().map(ManagementLogisticsOrderVO::getLOrderId).map(Long::parseLong).toList());
+            if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
+                collect1 = kwtLogisticsOrderLineFreightRates.stream().collect(Collectors.groupingBy(KwtLogisticsOrderLineFreightRate::getLOrderId));
+            }
+        }
         for (ManagementLogisticsOrderVO vo : list) {
+
+            List<KwtLogisticsOrderLineFreightRate> kwtLogisticsOrderLineFreightRates = collect1.get(Long.parseLong(vo.getLOrderId()));
+            if (CollectionUtils.isNotEmpty(kwtLogisticsOrderLineFreightRates)) {
+                vo.setPrices(kwtLogisticsOrderLineFreightRates.stream().map(item -> item.getName() + " " + item.getTransportPrice()).toList());
+            }
+
             vo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
             vo.setAccountsCycleLabel(settlementDictData.get(vo.getAccountsCycle()));
             vo.setAppointor(longUserMap.get(vo.getCreateBy()) == null ? null : longUserMap.get(vo.getCreateBy()).getName());