Merge branch 'dev_20251130' of https://git.sckaiwu.cn/kaiwu-rep/sckw-service-platform into dev_20251130

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/feign/DriverScoreFeignService.java

@@ -6,12 +6,20 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "sckw-ng-fleet",path = "/driverScore")
+@FeignClient(name = "sckw-ng-fleet")
 public interface DriverScoreFeignService {
     /**
      * 更新司机评分
      */
-    @PostMapping("/update")
+    @PostMapping("/driverScore/update")
     public HttpResult update(@Validated @RequestBody UpdateDriverScoreDto updateDriverScoreDto);
-}
+
+    /**
+     * 统计司机数量
+     */
+    @PostMapping("/kwfDriver/countDriver")
+    public HttpResult countDriver(@RequestParam("entId") Long entId);
+ }
+

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/feign/TradeOrderApi.java

@@ -1,20 +1,21 @@
 package com.sckw.order.api.feign;
 
 import com.sckw.order.api.model.TradeOrderPara;
-import com.sckw.order.api.model.TradeOrderVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import java.util.List;
-
 /**
  * @author xucaiqin
  * @date 2025-12-01 15:26:28
  */
 @FeignClient(name = "sckw-order-ai", contextId = "tradeOrderApi")
 public interface TradeOrderApi {
-
-    @GetMapping(value = "/trade/order/get")
-    List<TradeOrderVo> queryTradeOrder(TradeOrderPara tradeOrderPara);
+    /**
+     * 更新装卸货量
+     * @param tradeOrderPara
+     * @return
+     */
+    @GetMapping(value = "/trade/order/update")
+    void updateLoad(TradeOrderPara tradeOrderPara);
 
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/impl/KwcContractLogisticsScoreServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sckw.contract.service.impl;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -397,24 +398,33 @@ public class KwcContractLogisticsScoreServiceImpl implements IKwcContractLogisti
         KwcContractLogisticsScore logisticsScore = kwcContractLogisticsScoreMapper.selectLogisticsScoreByEntId(detailDto.getProviderEntId(),detailDto.getLogisticsEntId());
         //1、更新企业评分
         BigDecimal score = logisticsScore.getScore();
-        BigDecimal resultScore = score.add(detailDto.getScoreChange());
-        logisticsScore.setScore(resultScore);
-        logisticsScore.setUpdateBy(LoginUserHolder.getUserId());
-        logisticsScore.setUpdateTime(new Date());
-        kwcContractLogisticsScoreMapper.updateKwcContractLogisticsScore(logisticsScore);
-        //2.插入评分明细记录
-        LogisticsScoreDetailAddDto detailAddDto = new LogisticsScoreDetailAddDto();
-        detailAddDto.setScoreId(logisticsScore.getId());
-        detailAddDto.setInfluenceBy(detailDto.getInfluenceBy());
-        detailAddDto.setAction(detailDto.getAction());
-        detailAddDto.setScoreChange(detailDto.getScoreChange());
-        detailAddDto.setScore(resultScore);
-        //2.设置评分状态为通过
-        detailAddDto.setStatus(NumberConstant.ONE);
-        //3.构建评分明细记录
-        KwcContractLogisticsScoreDetail logisticsScoreDetail = buildLogisticsScoreDetail(detailAddDto);
-        //4.插入数据
-        return SqlHelper.retBool(kwcContractLogisticsScoreDetailMapper.insertKwcContractLogisticsScoreDetail(logisticsScoreDetail));
+        //查询物流企业下所有的司机
+        HttpResult result = driverScoreFeignService.countDriver(detailDto.getLogisticsEntId());
+        if(result.getCode() == HttpStatus.SUCCESS_CODE  && (Integer)result.getData()>0){
+           Integer driverCount =(Integer)result.getData();
+                //企业变动评分
+            BigDecimal entScoreChange = detailDto.getScoreChange().divide(new BigDecimal(driverCount),2, RoundingMode.HALF_UP);
+            BigDecimal resultScore = score.add(entScoreChange);
+            logisticsScore.setScore(resultScore);
+            logisticsScore.setUpdateBy(LoginUserHolder.getUserId());
+            logisticsScore.setUpdateTime(new Date());
+            kwcContractLogisticsScoreMapper.updateKwcContractLogisticsScore(logisticsScore);
+            //2.插入评分明细记录
+            LogisticsScoreDetailAddDto detailAddDto = new LogisticsScoreDetailAddDto();
+            detailAddDto.setScoreId(logisticsScore.getId());
+            detailAddDto.setInfluenceBy(detailDto.getInfluenceBy());
+            detailAddDto.setAction(detailDto.getAction());
+            detailAddDto.setScoreChange(entScoreChange);
+            detailAddDto.setScore(resultScore);
+            //2.设置评分状态为通过
+            detailAddDto.setStatus(NumberConstant.ONE);
+            //3.构建评分明细记录
+            KwcContractLogisticsScoreDetail logisticsScoreDetail = buildLogisticsScoreDetail(detailAddDto);
+            //4.插入数据
+            return SqlHelper.retBool(kwcContractLogisticsScoreDetailMapper.insertKwcContractLogisticsScoreDetail(logisticsScoreDetail));
+        }else{
+            throw new BusinessException("查询物流企业司机数量失败");
+        }
     }
 
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -361,5 +361,10 @@ public class KwfDriverController {
         return BaseResult.success();
     }
 
+    @PostMapping("/countDriver")
+    public HttpResult countDriver(@RequestParam("entId") Long entId) {
+        Integer driverCount = driverService.countDriversByEntId(entId);
+        return HttpResult.ok(driverCount);
+    }
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverMapper.java

@@ -59,6 +59,13 @@ public interface KwfDriverMapper extends BaseMapper<KwfDriver> {
 
     List<KwfDriver> findListByEntId(Long entId);
 
+    /**
+     * 统计   当前企业的司机数量
+     * @param entId
+     * @return
+     */
+    Integer countDriversByEntId(Long entId);
+
     /**
      * 查询
      * @param params

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -103,6 +103,9 @@ public class KwfDriverService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     private TransportRemoteService transportRemoteService;
 
+    @Autowired
+    private KwfDriverMapper driverMapper;
+
     /**
      * @param key 逐渐id
      * @desc 根据主键查询
@@ -1477,4 +1480,14 @@ public class KwfDriverService {
     }
 
 
+    /**
+     * @param
+     * @desc 查询
+     * @author zk
+     * @date 2023/7/6
+     **/
+    public Integer countDriversByEntId(Long entId) {
+        return driverMapper.countDriversByEntId(entId);
+    }
+
 }

sckw-modules/sckw-fleet/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: sckw-ng-fleet
   profiles:
     #    active: ${DEPLOY_MODE:dev}
-    active: test
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -279,7 +279,7 @@
         ORDER BY dr.create_time desc
     </select>
 
-    <select id="findListByEntId" resultType="com.sckw.fleet.model.KwfDriver" parameterType="java.util.Map" >
+    <select id="findListByEntId" resultType="com.sckw.fleet.model.KwfDriver" parameterType="java.lang.Long" >
         SELECT
         dr.id, name, phone, idcard, total_complete totalComplete,
         total_take totalTake, total_weight totalWeight, dre.ent_id entId
@@ -289,6 +289,14 @@
         and dre.ent_id = #{entId, jdbcType=VARCHAR}
     </select>
 
+    <select id="countDriversByEntId" resultType="java.lang.Integer" parameterType="java.lang.Long" >
+        SELECT count(1)
+        from kwf_driver dr
+                 inner join kwf_driver_ent dre on dr.id = dre.driver_id
+        where dr.del_flag = 0 and dre.del_flag = 0
+          and dre.ent_id = #{entId}
+    </select>
+
     <select id="findDriver" resultType="com.sckw.fleet.model.KwfDriver" parameterType="java.util.Map" >
         SELECT
             id, ent_id entId, name, phone, salt, password, idcard, total_complete totalComplete,

sckw-modules/sckw-order/src/main/java/com/sckw/order/feign/TradeOrderApiImpl.java

@@ -20,7 +20,6 @@ public class TradeOrderApiImpl implements TradeOrderApi {
 
 
     @Override
-    public List<TradeOrderVo> queryTradeOrder(TradeOrderPara tradeOrderPara) {
-        return kwoTradeOrderService.queryOrder(tradeOrderPara);
+    public void updateLoad(TradeOrderPara tradeOrderPara) {
     }
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderListResVO.java

@@ -72,6 +72,7 @@ public class OrderListResVO {
      */
     private String deliveryType;
 
+
     /**
      * 交付类型label
      */
@@ -127,6 +128,8 @@ public class OrderListResVO {
     private String goodsSpec;
 
     private String goodsTaxRate;
+    private String goodsTypeLabel;
+    private String goodsType;
 
     /**
      * 商品缩略图

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -27,7 +27,6 @@ import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.*;
-import com.sckw.core.model.enums.DispatchWayEnums;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.model.vo.TableBottom;
@@ -73,8 +72,8 @@ import com.sckw.stream.model.SckwBusSum;
 import com.sckw.stream.model.SckwMessage;
 import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
-import com.sckw.system.api.model.dto.req.ActualDisPatchDto;
 import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.req.ActualDisPatchDto;
 import com.sckw.system.api.model.dto.res.*;
 import com.sckw.transport.api.dubbo.TransportRemoteService;
 import com.sckw.transport.api.model.param.AddLogisticOrderParam;
@@ -1595,20 +1594,22 @@ public class KwoTradeOrderService {
         Map<Long, UserCacheResDto> userMap = remoteSystemService.queryUserCacheMapByIds(createByIds);
         Map<Long, KwpGoods> goodsMap = goodsInfoService.getGoodsByIds(goodIdList);
         Map<Long, ContractCommonInfoResDto> contractMap = remoteContractService.queryContractBaseInfo(contracIdList);
-        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.TORDER_STATUS.getType(), DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.SETTLEMENT_WAY.getType(), DictTypeEnum.CONSIGNMENT_WAY.getType(), DictTypeEnum.TORDER_SOURCE.getType()));
+        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.TORDER_STATUS.getType(), DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.SETTLEMENT_WAY.getType(), DictTypeEnum.CONSIGNMENT_WAY.getType(), DictTypeEnum.TORDER_SOURCE.getType()));
         Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
-        Map<String, String> tradeMap, deliveryMap, pickupMap, sourceMap;
+        Map<String, String> tradeMap, deliveryMap, pickupMap, sourceMap, nameMap;
         if (CollUtil.isNotEmpty(dict)) {
             tradeMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ? dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             deliveryMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.SETTLEMENT_WAY.getType())) ? dict.get(DictTypeEnum.SETTLEMENT_WAY.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             pickupMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.CONSIGNMENT_WAY.getType())) ? dict.get(DictTypeEnum.CONSIGNMENT_WAY.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.TORDER_SOURCE.getType())) ? dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            nameMap = CollUtil.isNotEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ? dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
 
         } else {
             tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             deliveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            nameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         list.forEach(e -> {
             //装货地址
@@ -1626,7 +1627,14 @@ public class KwoTradeOrderService {
             UserCacheResDto userCache = userMap.get(e.getCreateBy());
 
             OrderListResVO vo = BeanUtil.copyProperties(e, OrderListResVO.class);
-            vo.setStatusLabel(TradeOrderStatusEnum.getMsg(e.getStatus())).setTradingLabel(tradeMap.get(e.getTrading())).setTrading(tradeMap.get(e.getTrading())).setDeliveryType(deliveryMap.get(e.getDeliveryType())).setPickupTypeLabel(pickupMap.get(e.getPickupType())).setSourceLabel(sourceMap.get(e.getSource())).setSource(sourceMap.get(e.getSource())).setContractName(Objects.isNull(contract) ? null : contract.getContactName()).setContractSigningWay(Objects.isNull(contract) ? null : contract.getSigningWayName()).setGoodsName(Objects.isNull(goods) ? null : goods.getName()).setGoodsSpec(Objects.isNull(goods) ? null : goods.getSpec()).setGoodsTaxRate(Objects.isNull(goods) ? null : goods.getTaxRate()).setGoodsThumb(Objects.isNull(goods) ? null : goods.getThumb()).setWaitEntrustAmount(setScale(getWaitEntrustAmount(e.getAmount(), e.getEntrustAmount()))).setActualPrice(actualAmount.multiply(unitPrice).setScale(2, RoundingMode.HALF_UP)).setUnitPrice(setScale(e.getUnitPrice())).setPrice(setScale(e.getPrice())).setUnit(e.getUnit()).setUnitLabel(unitType == null ? e.getUnit() : (unitType.get(e.getUnit()) == null ? e.getUnit() : unitType.get(e.getUnit()).getLabel())).setAmount(setScale(vo.getAmount())).setEntrustAmount(setScale(e.getEntrustAmount())).setActualAmount(setScale(e.getActualAmount())).setCreateByName(Objects.isNull(userCache) ? null : userCache.getName());
+            vo.setStatusLabel(TradeOrderStatusEnum.getMsg(e.getStatus())).setTradingLabel(tradeMap.get(e.getTrading())).setTrading(tradeMap.get(e.getTrading())).setDeliveryType(deliveryMap.get(e.getDeliveryType())).setPickupTypeLabel(pickupMap.get(e.getPickupType())).setSourceLabel(sourceMap.get(e.getSource())).setSource(sourceMap.get(e.getSource())).setContractName(Objects.isNull(contract) ? null : contract.getContactName()).setContractSigningWay(Objects.isNull(contract) ? null : contract.getSigningWayName()).setGoodsName(Objects.isNull(goods) ? null : goods.getName());
+            vo.setGoodsSpec(Objects.isNull(goods) ? null : goods.getSpec());
+            vo.setGoodsTaxRate(Objects.isNull(goods) ? null : goods.getTaxRate());
+            vo.setGoodsThumb(Objects.isNull(goods) ? null : goods.getThumb());
+            vo.setGoodsType(Objects.isNull(goods) ? null : goods.getGoodsType());
+            vo.setGoodsTypeLabel(nameMap.get(Objects.isNull(goods) ? null : goods.getGoodsType()));
+            vo.setWaitEntrustAmount(setScale(getWaitEntrustAmount(e.getAmount(), e.getEntrustAmount())));
+            vo.setActualPrice(actualAmount.multiply(unitPrice).setScale(2, RoundingMode.HALF_UP)).setUnitPrice(setScale(e.getUnitPrice())).setPrice(setScale(e.getPrice())).setUnit(e.getUnit()).setUnitLabel(unitType == null ? e.getUnit() : (unitType.get(e.getUnit()) == null ? e.getUnit() : unitType.get(e.getUnit()).getLabel())).setAmount(setScale(vo.getAmount())).setEntrustAmount(setScale(e.getEntrustAmount())).setActualAmount(setScale(e.getActualAmount())).setCreateByName(Objects.isNull(userCache) ? null : userCache.getName());
             vo.setDeliveryTypeLabel(DictEnum.getLabel(DictTypeEnum.LOAD_UNLOAD_WAY.getType(), String.valueOf(e.getChargeType())));
             loadAddress.ifPresent(d -> {
                 vo.setLoadName(d.getName());
@@ -2221,16 +2229,44 @@ public class KwoTradeOrderService {
             addLogisticOrderParam.setActualDisPatch(actualDisPatch);
 
         } else if (Objects.equals(tradeContractResDto.getConsignment(), 2)) {
-                List<LogisticInfo> collect = logisticsContractId.stream().map(d -> {
+            List<LogisticInfo> collect = logisticsContractId.stream().map(d -> {
+                LogisticInfo logisticInfo = new LogisticInfo();
+                logisticInfo.setContractId(d.getContractId());
+                logisticInfo.setContractNo(d.getContractNo());
+                logisticInfo.setContractName("");
+                logisticInfo.setAcceptCompanyId(d.getEntId());
+                logisticInfo.setAcceptContactPhone("");
+                logisticInfo.setAcceptContacts(d.getContacts());
+                logisticInfo.setAcceptContactsId(d.getContactsId());
+                logisticInfo.setAcceptCompany("");
+                logisticInfo.setPrice(d.getTransportPrice());
+                logisticInfo.setPriceType(0L);
+                logisticInfo.setAmount(new BigDecimal("0"));
+                logisticInfo.setAmountUnit("");
+                logisticInfo.setLoss(new BigDecimal("0"));
+                logisticInfo.setPayment(0L);
+                logisticInfo.setSigningWay(0);
+                logisticInfo.setLossUnit("");
+                logisticInfo.setRemark("");
+                logisticInfo.setType(0);
+
+                return logisticInfo;
+            }).collect(Collectors.toList());
+            addLogisticOrderParam.setLogisticInfo(collect);
+        } else {
+            List<KwoTradeOrderTransport> list = kwoTradeOrderTransportService.queryList(kwoTradeOrder.getId());
+            if (CollUtil.isNotEmpty(list)) {
+                //Map<Long, ContractCommonInfoResDto> contractMap = remoteContractService.queryContractBaseInfo(list.stream().map(KwoTradeOrderTransport::getContractId).collect(Collectors.toList()));
+                List<LogisticInfo> collect = list.stream().map(d -> {
                     LogisticInfo logisticInfo = new LogisticInfo();
                     logisticInfo.setContractId(d.getContractId());
                     logisticInfo.setContractNo(d.getContractNo());
                     logisticInfo.setContractName("");
                     logisticInfo.setAcceptCompanyId(d.getEntId());
-                    logisticInfo.setAcceptContactPhone("");
+                    logisticInfo.setAcceptContactPhone(d.getPhone());
                     logisticInfo.setAcceptContacts(d.getContacts());
                     logisticInfo.setAcceptContactsId(d.getContactsId());
-                    logisticInfo.setAcceptCompany("");
+                    logisticInfo.setAcceptCompany(d.getFirmName());
                     logisticInfo.setPrice(d.getTransportPrice());
                     logisticInfo.setPriceType(0L);
                     logisticInfo.setAmount(new BigDecimal("0"));
@@ -2245,37 +2281,9 @@ public class KwoTradeOrderService {
                     return logisticInfo;
                 }).collect(Collectors.toList());
                 addLogisticOrderParam.setLogisticInfo(collect);
-            } else {
-                List<KwoTradeOrderTransport> list = kwoTradeOrderTransportService.queryList(kwoTradeOrder.getId());
-                if (CollUtil.isNotEmpty(list)) {
-                    //Map<Long, ContractCommonInfoResDto> contractMap = remoteContractService.queryContractBaseInfo(list.stream().map(KwoTradeOrderTransport::getContractId).collect(Collectors.toList()));
-                    List<LogisticInfo> collect = list.stream().map(d -> {
-                        LogisticInfo logisticInfo = new LogisticInfo();
-                        logisticInfo.setContractId(d.getContractId());
-                        logisticInfo.setContractNo(d.getContractNo());
-                        logisticInfo.setContractName("");
-                        logisticInfo.setAcceptCompanyId(d.getEntId());
-                        logisticInfo.setAcceptContactPhone(d.getPhone());
-                        logisticInfo.setAcceptContacts(d.getContacts());
-                        logisticInfo.setAcceptContactsId(d.getContactsId());
-                        logisticInfo.setAcceptCompany(d.getFirmName());
-                        logisticInfo.setPrice(d.getTransportPrice());
-                        logisticInfo.setPriceType(0L);
-                        logisticInfo.setAmount(new BigDecimal("0"));
-                        logisticInfo.setAmountUnit("");
-                        logisticInfo.setLoss(new BigDecimal("0"));
-                        logisticInfo.setPayment(0L);
-                        logisticInfo.setSigningWay(0);
-                        logisticInfo.setLossUnit("");
-                        logisticInfo.setRemark("");
-                        logisticInfo.setType(0);
-
-                        return logisticInfo;
-                    }).collect(Collectors.toList());
-                    addLogisticOrderParam.setLogisticInfo(collect);
-                }
-
             }
+
+        }
         addLogisticOrderParam.setTradeOrderId(kwoTradeOrder.getId());
         addLogisticOrderParam.setTradeOrderNo(kwoTradeOrder.getTOrderNo());
         addLogisticOrderParam.setBillingMode(String.valueOf(kwoTradeOrder.getChargeType()));
@@ -2359,6 +2367,7 @@ public class KwoTradeOrderService {
 
     /**
      * 实际派车数
+     *
      * @param tradeOrder
      * @param addressList
      * @return
@@ -2383,8 +2392,7 @@ public class KwoTradeOrderService {
         dto.setVehicleAvgSpeed(truckDispatchVO.getVehicleAvgSpeed());
 
         //查询贸易订单装卸货地址
-        Map<Integer, KwoTradeOrderAddress> addressMap = addressList.stream().collect(Collectors.toMap(
-                address -> StringUtils.isBlank(address.getAddressType()) ? 0 : Integer.valueOf(address.getAddressType()), Function.identity(), (x, y) -> x));
+        Map<Integer, KwoTradeOrderAddress> addressMap = addressList.stream().collect(Collectors.toMap(address -> StringUtils.isBlank(address.getAddressType()) ? 0 : Integer.valueOf(address.getAddressType()), Function.identity(), (x, y) -> x));
         KwoTradeOrderAddress shipmentAddress = addressMap.getOrDefault(AddressTypeEnum.SHIPMENT.getCode(), new KwoTradeOrderAddress());
         KwoTradeOrderAddress takeAddress = addressMap.getOrDefault(AddressTypeEnum.TAKE.getCode(), new KwoTradeOrderAddress());
         dto.setLon1(shipmentAddress.getLng());
@@ -2404,6 +2412,7 @@ public class KwoTradeOrderService {
 
     /**
      * 物流企业可派车
+     *
      * @param byOrderId
      * @param contractLogisticsList
      * @return
@@ -2411,16 +2420,13 @@ public class KwoTradeOrderService {
     public Integer getEntAvailableVehicle(KwoTradeOrderGoods byOrderId, List<LogisticsEntDtoVO> contractLogisticsList) {
         List<Long> contractIds = contractLogisticsList.stream().map(LogisticsEntDtoVO::getContractId).collect(Collectors.toList());
         //物流企业总运力
-        int sumAvailableVehicle = contractIds.stream()
-                .filter(Objects::nonNull)
-                .map(contractId -> getSignEntAvailableVehicle(byOrderId.getGoodsId(), contractId))
-                .mapToInt(num -> num == null ? 0 : num)
-                .sum();
+        int sumAvailableVehicle = contractIds.stream().filter(Objects::nonNull).map(contractId -> getSignEntAvailableVehicle(byOrderId.getGoodsId(), contractId)).mapToInt(num -> num == null ? 0 : num).sum();
         return sumAvailableVehicle;
     }
 
     /**
      * 单个物流企业满足轴数可派车
+     *
      * @param goodId
      * @param contractId
      * @return
@@ -2438,10 +2444,7 @@ public class KwoTradeOrderService {
 
         //当前物流企业总运力
         List<RTruckVo> truckVoList = remoteFleetService.findTruckByEntIds(unitDto.getEntId());
-        return Math.toIntExact(truckVoList.stream()
-                .filter(Objects::nonNull)
-                .filter(truck -> Objects.equals(truck.getCarAxis(), String.valueOf(carAxisInfo.getId())))
-                .count());
+        return Math.toIntExact(truckVoList.stream().filter(Objects::nonNull).filter(truck -> Objects.equals(truck.getCarAxis(), String.valueOf(carAxisInfo.getId()))).count());
     }