Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-web/src/main/java/com/clx/performance/component/GoodsOrderTruckRecordComponent.java

 package com.clx.performance.component;
 
-import cn.hutool.core.util.StrUtil;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -10,11 +9,15 @@ import com.clx.performance.model.OrderGoodsTruckBind;
 import com.msl.common.base.Optional;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -95,4 +98,21 @@ public class GoodsOrderTruckRecordComponent {
         orderGoodsTruckBindDao.updateOrderGoodsBindStatusExpire(orderGoodsNo, truckNo);
 
     }
+    //货单剩余吨数低于35吨时，自动恢复到订单，并释放未接单车辆
+    public void releaseOrderGoodsDriverAndTruck(String orderGoodsNo) {
+        List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo);
+        List<Integer> ids = new ArrayList<>();
+        for (OrderGoodsTruckBind bind : truckBindList) {
+            if (Objects.equals(OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),bind.getStatus())) {
+                this.deleteTruckRecord(orderGoodsNo, bind.getTruckNo());
+            }
+        }
+        //释放车辆bind
+        if(CollectionUtils.isNotEmpty(ids)){
+            log.info("定向单进行车辆释放,货单编号:{},释放的绑定车辆的id集合:{}",orderGoodsNo,ids);
+            orderGoodsTruckBindDao.updateTruckBindExpire(ids);
+        }
+
+    }
+
 }

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -3,14 +3,17 @@ package com.clx.performance.component;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.enums.OrderEnum;
+import com.clx.order.enums.UpdateEnum;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
+import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
+import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
@@ -20,6 +23,7 @@ import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.user.enums.driver.DriverInfoEnum;
+import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
@@ -30,10 +34,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
@@ -63,6 +64,8 @@ public class OrderCancelComponent implements InitializingBean {
 
     private final OrderChildPostService orderChildPostService;
 
+    private final OrderService orderService;
+
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
@@ -231,6 +234,80 @@ public class OrderCancelComponent implements InitializingBean {
         }
     }
 
+    /**
+     * @Author kavin
+     * @Description 货单低于35吨自动归还吨数到订单/货单吨数不够扣减，从订单上借吨数
+     * @Param [orderGoods, weight,updateType(1: 增加 2：减少)]
+     * @return 
+     **/
+    public void backFillOrderWeight(OrderGoods orderGoods, BigDecimal weight, Integer updateType) {
+        String orderNo = orderGoods.getOrderNo();
+        Optional<FeignOrderInfoVO> optional = orderService.getOrderInfo(orderNo);
+        if(!optional.isPresent()){
+            log.error("通过订单号未查询到对应的订单信息,订单号:{}",orderNo);
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+        FeignOrderInfoVO orderInfo = optional.get();
+        boolean isSub = Objects.equals(UpdateEnum.SUB.getCode(), updateType);
+        Integer truckDemand = orderGoods.getTruckDemand();
+        RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
+        rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
+        rollbackOrderWeightParam.setResidueWeight(weight);
+        java.util.Optional<TruckDemandEnum.TruckType> byCode = TruckDemandEnum.TruckType.getByCode(truckDemand);
+        String truckDemandValue = byCode.isPresent()?byCode.get().getMsg():"未知用车需求";
+        java.util.Optional<UpdateEnum> byCode1 = UpdateEnum.getByCode(updateType);
+        String updateTypeMsg = byCode1.isPresent()?byCode1.get().getMsg():"未知调整类型";
+        //归还吨数
+        if (!truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
+            if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
+                if(isSub && weight.compareTo(orderInfo.getPlatformResidueCarryWeight()) > 0 ){
+                    log.warn("货单用车需求: {},订单号：{},货单号：{},平台剩余吨数:{},需要扣减吨数:{},不足扣减",
+                            truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),orderInfo.getPlatformResidueCarryWeight()
+                            ,weight);
+                    throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+                }
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
+            } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+                if(isSub && weight.compareTo(orderInfo.getOwnResidueCarryWeight()) > 0 ){
+                    log.warn("货单用车需求: {},订单号：{},货单号：{},自有剩余吨数:{},需要扣减吨数:{},不足扣减",
+                            truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),orderInfo.getOwnResidueCarryWeight()
+                            ,weight);
+                    throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+                }
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+            }
+        } else {
+            if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
+                if(isSub && weight.compareTo(orderInfo.getOwnResidueCarryWeight()) > 0 ){
+                    log.warn("货单用车需求: {},订单号：{},货单号：{},自有剩余吨数:{},需要扣减吨数:{},不足扣减",
+                            TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getMsg(),orderNo,orderGoods.getOrderGoodsNo(),
+                            orderInfo.getOwnResidueCarryWeight(),weight);
+                    throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+                }
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
+            } else {
+                if(isSub && weight.compareTo(orderInfo.getPlatformResidueCarryWeight()) > 0 ){
+                    log.warn("货单用车需求: {},订单号：{},货单号：{},平台剩余吨数:{},需要扣减吨数:{},不足扣减",
+                            truckDemandValue,orderNo,orderGoods.getOrderGoodsNo(),
+                            orderInfo.getPlatformResidueCarryWeight(),weight);
+                    throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+                }
+                rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
+                rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+            }
+        }
+        Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
+        if (!result.succeed()) {
+            log.error("订单号：{} 的订单做吨数调整，对应货单号:{} 调整失败，调整吨数：{},调整类型:{}",
+                    orderNo,orderGoods.getOrderGoodsNo(),weight,updateTypeMsg);
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
+        }
+    }
+
+
     /**
      * 客服取消归还吨数
      *

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -39,6 +39,9 @@ public class RabbitKeyConstants {
     //承运订单同步一部  需要手动创建对列交换机
     public static final String CLX_PERFORMANCE_ORDER_CHILD_QUEUE = "clx_performance.order_child_queue";
 
+    //承运货单监听  需要手动创建对列交换机
+    public static final String CLX_PERFORMANCE_ORDER_GOODS_QUEUE = "clx_performance.order_goods_queue";
+
     public static final String ORDER_GOODS_ON_QUEUE ="clx-order.order.goods.on.queue";
 
     public static final String ORDER_GOODS_ON_EXCHANGE ="clx-order.order.goods.on.exchange";

performance-web/src/main/java/com/clx/performance/controller/pc/LargeScreenController.java

+package com.clx.performance.controller.pc;
+
+import cn.hutool.json.JSONUtil;
+import com.clx.performance.service.LargeScreenService;
+import com.clx.performance.service.OrderChildService;
+import com.clx.user.feign.DriverFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/pc/largescreen")
+@Validated
+@AllArgsConstructor
+@Api(tags = "PC-大屏")
+public class LargeScreenController {
+
+    private final LargeScreenService largeScreenService;
+
+
+    @ApiOperation(value = "空车列表", notes = "<br>By:胡宇帆")
+    @GetMapping("/emptyCarList")
+    public String emptyCarList() {
+        return JSONUtil.toJsonStr(largeScreenService.emptyCarList());
+    }
+
+    @ApiOperation(value = "重车列表", notes = "<br>By:胡宇帆")
+    @GetMapping("/weightCarList")
+    public String weightCarList() {
+        return JSONUtil.toJsonStr(largeScreenService.weightCarList());
+    }
+
+    @ApiOperation(value = "收货地址", notes = "<br>By:胡宇帆")
+    @GetMapping("/receiveAddress")
+    public String receiveAddress(@RequestParam(value = "addressId") Integer addressId) {
+        return largeScreenService.receiveAddress(addressId);
+    }
+
+    @ApiOperation(value = "发货地址", notes = "<br>By:胡宇帆")
+    @GetMapping("/sendAddress")
+    public String sendAddress(@RequestParam(value = "addressId") Integer addressId) {
+        return largeScreenService.sendAddress(addressId);
+    }
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -156,4 +156,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     Long haveArriveReceiveChild(String orderNo);
 
+
+    List<OrderChild> selectListWithEmptyCarList();
 }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsTruckBindDao.java

@@ -56,4 +56,7 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     void deleteByOrderGoods(String orderGoodsNo);
 
     List<String> findUnreleasedTruck();
+
+
+    void updateTruckBindExpire(List<Integer> ids);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -488,4 +488,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.selectCount(query);
     }
 
+
+
+    @Override
+    public List<OrderChild> selectListWithEmptyCarList() {
+        return baseMapper.selectList(lQrWrapper()
+                .le(OrderChild :: getStatus,OrderChildEnum.Status.UNSETTLE.getCode())
+                .ge(OrderChild :: getStatus,OrderChildEnum.Status.CREATED.getCode())
+        );
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

@@ -194,4 +194,12 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public List<String> findUnreleasedTruck() {
         return baseMapper.findUnreleasedTruck();
     }
+
+    @Override
+    public void updateTruckBindExpire(List<Integer> ids) {
+        update(lUdWrapper()
+                .in(OrderGoodsTruckBind::getId, ids)
+                .set(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.EXPIRE.getCode())
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

+package com.clx.performance.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.order.enums.UpdateEnum;
+import com.clx.performance.component.GoodsOrderTruckRecordComponent;
+import com.clx.performance.component.OrderCancelComponent;
+import com.clx.performance.constant.RabbitKeyConstants;
+import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dto.dts.DataTransportDTO;
+import com.clx.performance.enums.DtsOperationTypeEnum;
+import com.clx.performance.enums.OrderGoodsPendingOrderWayStatusEnum;
+import com.clx.performance.model.OrderGoods;
+import com.msl.common.utils.DtsMapConvertUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class OrderGoodsDtsListener {
+
+    private final OrderCancelComponent orderCancelComponent;
+    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+    private final OrderGoodsDao orderGoodsDao;
+
+
+
+    @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_GOODS_QUEUE)
+    public void onMessage(Message message) {
+        try {
+            String msg = new String(message.getBody());
+            log.info("DTS消息同步开始, database:clx_performance.order_goods, msg:{}", msg);
+            DataTransportDTO dataTransportDTO = JSON.parseObject(msg, DataTransportDTO.class);
+            OrderGoods before = DtsMapConvertUtil.convert(dataTransportDTO.getBeforeMap(), new OrderGoods());
+            OrderGoods after = DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderGoods());
+            if(Objects.equals(DtsOperationTypeEnum.INSERT.getCode(),dataTransportDTO.getOperationType().getCode())){
+                //同步after数据
+                log.info("新增:{}",after);
+            }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
+                log.info("修改:{}",after);
+                backFillOrderWeight(after);
+            }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
+                //数据删除
+                log.info("删除:{}",before);
+            }
+        } catch (Exception e) {
+            log.info("DTS消息同步失败, database:clx_performance.order_goods, error:{}", e.getMessage());
+        }
+    }
+
+    //货单剩余吨数不足35吨，自动恢复吨数到订单上
+    public void backFillOrderWeight(OrderGoods after){
+        //剩余吨数小于35吨，自动归还订单上
+        if(new BigDecimal("35").compareTo(after.getResidueTransportWeight()) > 0 &&
+                BigDecimal.ZERO.compareTo(after.getResidueTransportWeight()) != 0){
+            log.info("开始自动恢复吨数到订单,订单号:{},货单号:{},货单剩余吨数:{}",
+                    after.getOrderNo(),after.getOrderGoodsNo(),after.getResidueTransportWeight());
+            orderCancelComponent.backFillOrderWeight(after,after.getResidueTransportWeight(), UpdateEnum.ADD.getCode());
+            OrderGoods orderGoods = new OrderGoods();
+            orderGoods.setId(after.getId());
+            orderGoods.setResidueTransportWeight(BigDecimal.ZERO);
+            orderGoodsDao.updateEntityByKey(orderGoods);
+            //释放定向单对应的定向车辆
+            if(Objects.equals(after.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())){
+                goodsOrderTruckRecordComponent.releaseOrderGoodsDriverAndTruck(after.getOrderGoodsNo());
+            }
+            log.info("结束自动恢复吨数到订单,订单号:{},货单号:{},货单剩余吨数:{}",
+                    after.getOrderNo(),after.getOrderGoodsNo(),after.getResidueTransportWeight());
+        }
+
+    }
+}

performance-web/src/main/java/com/clx/performance/service/LargeScreenService.java

+package com.clx.performance.service;
+
+import cn.hutool.json.JSONObject;
+
+import java.util.List;
+
+public interface LargeScreenService {
+
+    List<JSONObject> weightCarList();
+
+    List<JSONObject> emptyCarList();
+
+    String receiveAddress(Integer addressId);
+
+    String sendAddress(Integer addressId);
+
+}

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSON;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
@@ -13,6 +14,7 @@ import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.pc.*;
 import com.clx.user.vo.pc.driver.truck.DriverTruckVo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 
@@ -83,4 +85,7 @@ public interface OrderChildService {
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
+
+    void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus);
+
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

 package com.clx.performance.service;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
-import com.clx.performance.param.pc.*;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -32,6 +28,11 @@ public interface OrderGoodsService {
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 
     void updateOrderGoodsReduceWeightAndStatusAmountLoad(OrderGoods orderGoods, BigDecimal orderChildWeight, Integer orderGoodsStatus);
+
+    void borrowWeight(OrderGoods orderGoods,String orderChildNo,BigDecimal subOrderGoodsResidue, BigDecimal addAlready,BigDecimal borrowOrderWeight,
+            Integer orderGoodsStatus);
+
+
     void updateOrderGoodsReduceWeightAndStatus(OrderGoods orderGoods, OrderChild orderChild, Integer orderGoodsStatus);
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsList(OrderGoodsListPageParam orderGoodsListParam);

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

+package com.clx.performance.service.impl;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.clx.order.feign.AddressFeign;
+import com.clx.order.feign.OrderFeign;
+import com.clx.order.vo.feign.FeignAddressVO;
+import com.clx.order.vo.feign.FeignOrderInfoVO;
+import com.clx.order.vo.feign.SystemAddressVO;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dto.zjxl.TruckTraceDTO;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.service.LargeScreenService;
+import com.clx.performance.utils.zjxl.ZjxlGpsService;
+import com.clx.user.feign.DriverFeign;
+import com.msl.common.base.Optional;
+import com.msl.common.enums.ResultEnum;
+import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+public class LargeScreenServiceImpl implements LargeScreenService {
+
+
+    private final ZjxlGpsService zjxlGpsService;
+
+    private final DriverFeign driverFeign;
+
+    private final AddressFeign addressFeign;
+
+    private final OrderChildDao orderChildDao;
+
+    private final OrderFeign orderFeign;
+
+    @Override
+    public List<JSONObject> emptyCarList() {
+        List<String> data = driverFeign.driverTruckList().getData();
+
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
+        List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
+        if (CollectionUtils.isEmpty(orderChildList)) {
+            return null;
+        }
+        List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
+        List<JSONObject> result = new LinkedList<>();
+        int index = 0;
+        for (String truckNo : data) {
+            if (list.contains(truckNo)) {
+                continue;
+            }
+
+            List<TruckTraceDTO> truckTrace = zjxlGpsService.getTruckTrace(truckNo, now,
+                    now);
+            if (CollectionUtils.isNotEmpty(truckTrace)) {
+                JSONObject jsonObject = new JSONObject();
+                BigDecimal[] location = truckTrace.get(truckTrace.size() - 1).getLocation();
+                BigDecimal longitude = location[0].setScale(4, BigDecimal.ROUND_DOWN);
+                BigDecimal latitude = location[1].setScale(4, BigDecimal.ROUND_DOWN);
+                jsonObject.set("id", ++index);
+                jsonObject.set("lng", longitude);
+                jsonObject.set("lat", latitude);
+                jsonObject.set("info", "");
+                jsonObject.set("value", "");
+                jsonObject.set("iconField", "ok");
+                result.add(jsonObject);
+            }
+
+        }
+        return result;
+
+    }
+
+    @Override
+    public List<JSONObject> weightCarList() {
+        List<String> data = driverFeign.driverTruckList().getData();
+
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
+        List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
+        if (CollectionUtils.isEmpty(orderChildList)) {
+            return null;
+        }
+        List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
+        List<JSONObject> result = new LinkedList<>();
+        int index = 0;
+        for (String truckNo : data) {
+            if (!list.contains(truckNo)) {
+                continue;
+            }
+
+            List<TruckTraceDTO> truckTrace = zjxlGpsService.getTruckTrace(truckNo, now,
+                    now);
+            if (CollectionUtils.isNotEmpty(truckTrace)) {
+                JSONObject jsonObject = new JSONObject();
+                BigDecimal[] location = truckTrace.get(truckTrace.size() - 1).getLocation();
+                BigDecimal longitude = location[0].setScale(4, BigDecimal.ROUND_DOWN);
+                BigDecimal latitude = location[1].setScale(4, BigDecimal.ROUND_DOWN);
+                jsonObject.set("id", ++index);
+                jsonObject.set("lng", longitude);
+                jsonObject.set("lat", latitude);
+                jsonObject.set("info", "");
+                jsonObject.set("value", "");
+                jsonObject.set("iconField", "ok");
+                result.add(jsonObject);
+            }
+
+        }
+        return result;
+    }
+
+
+    @Override
+    public String receiveAddress(Integer addressId) {
+        SystemAddressVO vo = Optional.of(addressFeign.getSystemReceiveAddress(addressId)).filter(Result::succeed)
+                .map(Result::getData).orElseThrow(PerformanceResultEnum.HTTP_ERROR);
+        JSONArray jsonArray = new JSONArray();
+        String name = vo.getAddressShorter();
+        BigDecimal longitude = vo.getLongitude().setScale(4, RoundingMode.DOWN);
+        BigDecimal latitude = vo.getLatitude().setScale(4, RoundingMode.DOWN);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.set("id", addressId);
+        jsonObject.set("lng", longitude);
+        jsonObject.set("lat", latitude);
+        jsonObject.set("name", name);
+        jsonObject.set("value", "");
+        jsonObject.set("iconField", "ok");
+        jsonArray.add(jsonObject);
+        return jsonArray.toString();
+    }
+
+    @Override
+    public String sendAddress(Integer addressId) {
+        List<SystemAddressVO> list = Optional.of(orderFeign.getOrderListByReceiveAddressId(addressId)).filter(Result::succeed)
+                .map(Result::getData).orElseThrow(PerformanceResultEnum.HTTP_ERROR);
+        JSONArray jsonArray = new JSONArray();
+
+        for (SystemAddressVO vo : list) {
+            String name = vo.getAddressShorter();
+            BigDecimal longitude = vo.getLongitude().setScale(4, RoundingMode.DOWN);
+            BigDecimal latitude = vo.getLatitude().setScale(4, RoundingMode.DOWN);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.set("id", addressId);
+            jsonObject.set("lng", longitude);
+            jsonObject.set("lat", latitude);
+            jsonObject.set("name", name);
+            jsonObject.set("value", "");
+            jsonObject.set("iconField", "ok");
+            jsonArray.add(jsonObject);
+        }
+
+        return jsonArray.toString();
+    }
+
+
+}

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

 package com.clx.performance.service.impl;
 
-
 import com.clx.performance.dao.*;
 import com.clx.performance.enums.*;
 import com.clx.performance.model.*;
 import com.clx.performance.param.pc.PoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildPoundAuditService;
+import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 import com.msl.common.exception.ServiceSystemException;
@@ -47,6 +47,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     private final OrderGoodsService orderGoodsService;
 
     private final OrderChildLogService orderChildLogService;
+    private final OrderChildService orderChildService;
 
 
     @Override
@@ -95,7 +96,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
 
         BigDecimal dif = param.getLoadNet().subtract(orderChild.getLoadNet());
 
-        Integer type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
+        int type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
         if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){
             type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode();
         }else{
@@ -113,7 +114,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         orderChild.setFreight(orderChildFreightCalc(orderChild));
 
         // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
+        updateOrderGoodsAmountLoad(orderGoods,orderChild.getChildNo(), dif);
 
         //更新运单数据
         orderChild.setPoundStatus(param.getStatus());
@@ -138,34 +139,15 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     /**
      * 装车补偿
      */
-    private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif){
-        int i = dif.compareTo(BigDecimal.ZERO);
-        if (i == 0){
-            return;
-        } else if (i > 0) {
-            if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
-            ) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_STATUS_NOT_GET);
-            }
-
-            if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
-            }
-        }
-
+    private void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif){
         int count = orderChildDao.countValidByOrderGoodsNo(orderGoods.getOrderGoodsNo())-1;
-
         Integer status;
         if (count == 0){
             status = OrderGoodsStatusEnum.Status.PAYING.getCode();
-        }
-        else {
+        }else{
             status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
         }
-
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, dif, status);
+        orderChildService.updateOrderGoodsAmountLoad(orderGoods,childNo,dif,status);
     }
 
     /**

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

@@ -8,7 +8,6 @@ import com.clx.order.enums.ResultEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
-import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
@@ -56,7 +55,6 @@ import com.msl.common.utils.LocalDateTimeUtils;
 import com.msl.common.utils.gps.GpsUtil;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -159,6 +157,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private FeignPaymentService feignPaymentService;
 
+
     @Autowired
     private TruckService truckService;
 
@@ -723,9 +722,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         BigDecimal dif = param.getLoadNet().subtract(orderChild.getWeight());
 
-        if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
-        }
+        //更新货单吨数
+        updateOrderGoodsAmountLoad(orderGoods, childNo,dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
@@ -735,9 +733,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
 
-        // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
-
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -767,8 +762,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
 
-        // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
+        //更新货单吨数
+        updateOrderGoodsAmountLoad(orderGoods,childNo, dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
         orderChildDao.updateLoad(orderChild);
 
@@ -998,7 +993,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         audit.setUnloadPoundNo(orderChild.getUnloadPoundNo());
 
         // 更新装车净重
-        updateOrderGoodsAmountLoad(orderGoods, dif);
+        updateOrderGoodsAmountLoad(orderGoods, childNo,dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
         orderChildDao.updateLoadAndUnload(orderChild);
 
@@ -1433,28 +1428,22 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     /**
-     * 装车补偿
+     * 更新货单吨数
      */
-    private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif) {
-        int i = dif.compareTo(BigDecimal.ZERO);
-        if (i == 0){
-            return;
-        } else if (i > 0) {
-            if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
-                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
-            ) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_STATUS_NOT_GET);
-            }
-
+    @Override
+    public void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus) {
+        if(dif.compareTo(BigDecimal.ZERO) != 0 ){
+            //判断是从订单借吨还是直接货单进行扣减(货单剩余吨数小于本运单的修改后的吨数差值)
             if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
-                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
+                //货单吨数不够扣减，从订单进行借吨数
+                orderGoodsService.borrowWeight(orderGoods,childNo,orderGoods.getResidueTransportWeight(),dif,
+                        dif.subtract(orderGoods.getResidueTransportWeight()),
+                        OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
+            }else{
+                // 货单吨数够扣减，直接更新货单剩余吨数和已拉运吨数和状态
+                orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, orderGoodsStatus);
             }
         }
-
-        Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
-
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, dif, status);
     }
 
     /**
@@ -1560,10 +1549,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 拉运吨数检测
      */
     private boolean loadCheck(BigDecimal weight, BigDecimal truckLoad) {
-        if (weight.compareTo(new BigDecimal("99")) > 0) {
-            return false;
-        }
-        return true;
+        return weight.compareTo(new BigDecimal("99")) <= 0;
     }
 
     /**
@@ -2120,4 +2106,5 @@ public class OrderChildServiceImpl implements OrderChildService {
         return "--";
     }
 
+
 }

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

@@ -749,4 +749,20 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         freightEstimateVO.setFreightPriceList(freightPrice);
         return freightEstimateVO;
     }
+
+    @Override
+    public void borrowWeight(OrderGoods orderGoods,String orderChildNo, BigDecimal subOrderGoodsResidue, BigDecimal addAlready,BigDecimal borrowOrderWeight,
+            Integer orderGoodsStatus) {
+        log.info("运单号:{} 进行订单借量,货单剩余吨数需扣减:{} 吨,货单已拉运吨数需增加:{} 吨,订单借用吨数:{} 吨",orderChildNo,
+                subOrderGoodsResidue,addAlready,borrowOrderWeight);
+        //更新订单吨数
+        orderCancelComponent.backFillOrderWeight(orderGoods,borrowOrderWeight, UpdateEnum.SUB.getCode());
+        //更新货单吨数
+        orderGoodsDao.updateOrderGoodsWeightResidueAndAlreadyAndStatus(orderGoods.getId(),subOrderGoodsResidue,addAlready,orderGoodsStatus);
+
+
+    }
+
+
+
 }

performance-web/src/test/java/com/clx/performance/JobTest.java

 package com.clx.performance;
 
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.OrderOwnTruckVo;
@@ -8,6 +9,7 @@ import com.clx.performance.component.OrderGoodsStatusLazyComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.param.mq.OrderCancelMqParam;
+import com.clx.performance.service.LargeScreenService;
 import com.clx.performance.service.OrderCancelService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,9 +51,13 @@ public class JobTest {
     @Autowired
     private OrderCancelService orderCancelService;
 
+    @Autowired
+    private LargeScreenService largeScreenService;
+
     @Test
     public void test1() {
-
+        JSONObject jsonObject = largeScreenService.receiveAddress(27);
+        System.out.println(jsonObject);
 //        OrderCancelMqParam mqParam = new OrderCancelMqParam();
 //        mqParam.setType("2");
 //        mqParam.setOrderNo("123");