阿里规范提交

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

@@ -171,8 +171,7 @@ public class AcceptCarriageOrderService {
             httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return httpResult;
         }
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, bo.getLOrderId()));
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, bo.getLOrderId()));
         if (logisticsOrder == null) {
             log.error("订单id查找失败:{},订单编号:{}", bo.getLOrderId(), bo.getLOrderNo());
             throw new BusinessException("单据错误,数据不存在");
@@ -219,10 +218,7 @@ public class AcceptCarriageOrderService {
         }
 //        int level = logisticsLevel(logisticsOrder);
         int level = newLogisticsLevel(logisticsOrder);
-        long number = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
-                        .apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId()))
-                .stream().count();
+        long number = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO).apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId())).stream().count();
         String pidOrderNo = logisticsOrder.getLOrderNo();
         String substring = pidOrderNo.substring(0, 11);
         String lOrderNo = substring + logisticsOrder.getType() + String.valueOf(level) + String.valueOf(number + 1);
@@ -263,10 +259,7 @@ public class AcceptCarriageOrderService {
         } else if (NumberConstant.ZERO == status) {
             orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
         } else {
-            log.info("承运订单-分包托运物流托运 承运订单id:{}," +
-                            "承运订单编号:{},合同id:{},合同信息:{}",
-                    bo.getLOrderId(), bo.getLOrderNo(),
-                    bo.getContractId(), JSONObject.toJSONString(infoResDto));
+            log.info("承运订单-分包托运物流托运 承运订单id:{}," + "承运订单编号:{},合同id:{},合同信息:{}", bo.getLOrderId(), bo.getLOrderNo(), bo.getContractId(), JSONObject.toJSONString(infoResDto));
             throw new RuntimeException("生成物流托运合同异常");
         }
         //主体信息保存
@@ -304,11 +297,7 @@ public class AcceptCarriageOrderService {
         carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
-        commonService.newSendLogisticsOrderToMessage(carriageUnit, checkUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER,
-                "1");
+        commonService.newSendLogisticsOrderToMessage(carriageUnit, checkUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER, "1");
 
         //修改父级mongodb数据
         //更新mongodb
@@ -352,8 +341,7 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setLOrderPid(Long.parseLong(bo.getLOrderId()));
         logisticsOrder.setSettlementCycle(bo.getSettlementCycle());
         logisticsOrder.setPrice(bo.getPrice());
-        logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
-                null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
+        logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ? null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
         if (!bo.getIsFullDose()) {
             if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
                 throw new RuntimeException("不是全量分配时,分配量不能为空!");
@@ -399,12 +387,8 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setCarrierEntId(Long.parseLong(bo.getConsignCompanyId()));
         logisticsOrder.setCarrierFirmName(bo.getConsignCompany());
         logisticsOrder.setCarrierContacts(bo.getConsignContacts());
-        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, kwtLogisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
         if (!ObjectUtils.isEmpty(orderLoadAddress)) {
             logisticsOrder.setLoadType(orderLoadAddress.getType());
             logisticsOrder.setLoadCityCode(orderLoadAddress.getCityCode());
@@ -477,12 +461,8 @@ public class AcceptCarriageOrderService {
     private void insertSubcontractLogisticsOrderAddress(SubcontractConsignmentDTO bo, Long orderId, KwtLogisticsOrder logisticsOrder) {
         KwtLogisticsOrderAddress loadOrderAddress = new KwtLogisticsOrderAddress();
         KwtLogisticsOrderAddress unloadOrderAddress = new KwtLogisticsOrderAddress();
-        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId())
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderAddress orderLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress orderUnLoadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
         if (!ObjectUtils.isEmpty(orderLoadAddress)) {
             loadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
             loadOrderAddress.setAddressType(NumberConstant.ONE);
@@ -543,38 +523,10 @@ public class AcceptCarriageOrderService {
 //        .setContactsId(consignentMap.get(Long.parseLong(bo.getConsignCompanyId())).getContactsId())
         EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
 ////.setContactsId(checkentMap.get(Long.parseLong(bo.getCheckCompanyId())).getContactsId())
-        KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit()
-                .setLOrderId(orderId)
-                .setId(new IdWorker(NumberConstant.ONE).nextId())
-                .setUnitType(NumberConstant.ONE)
-                .setFirmName(bo.getCheckCompany())
-                .setRemark(bo.getRemark())
-                .setTopEntId(checkentMap == null ? null : checkentMap.getId())
-                .setEntId(Long.parseLong(bo.getCheckCompanyId()))
-                .setContacts(bo.getCheckContacts())
-                .setPhone(bo.getCheckContactPhone())
-                .setCreateBy(LoginUserHolder.getUserId())
-                .setCreateTime(new Date())
-                .setUpdateBy(LoginUserHolder.getUserId())
-                .setUpdateTime(new Date())
-                .setContactsId(Long.parseLong(bo.getCheckContactsId()));
+        KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit().setLOrderId(orderId).setId(new IdWorker(NumberConstant.ONE).nextId()).setUnitType(NumberConstant.ONE).setFirmName(bo.getCheckCompany()).setRemark(bo.getRemark()).setTopEntId(checkentMap == null ? null : checkentMap.getId()).setEntId(Long.parseLong(bo.getCheckCompanyId())).setContacts(bo.getCheckContacts()).setPhone(bo.getCheckContactPhone()).setCreateBy(LoginUserHolder.getUserId()).setCreateTime(new Date()).setUpdateBy(LoginUserHolder.getUserId()).setUpdateTime(new Date()).setContactsId(Long.parseLong(bo.getCheckContactsId()));
         logisticsOrderUnitMapper.insert(checkUnit);
 
-        KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit()
-                .setLOrderId(orderId)
-                .setId(new IdWorker(NumberConstant.ONE).nextId())
-                .setUnitType(NumberConstant.TWO)
-                .setFirmName(bo.getConsignCompany())
-                .setRemark(bo.getRemark())
-                .setTopEntId(consignentMap == null ? null : consignentMap.getId())
-                .setEntId(Long.parseLong(bo.getConsignCompanyId()))
-                .setContacts(bo.getConsignContacts())
-                .setPhone(bo.getConsignContactPhone())
-                .setCreateBy(LoginUserHolder.getUserId())
-                .setCreateTime(new Date())
-                .setUpdateBy(LoginUserHolder.getUserId())
-                .setUpdateTime(new Date())
-                .setContactsId(Long.parseLong(bo.getConsignContactsId()));
+        KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit().setLOrderId(orderId).setId(new IdWorker(NumberConstant.ONE).nextId()).setUnitType(NumberConstant.TWO).setFirmName(bo.getConsignCompany()).setRemark(bo.getRemark()).setTopEntId(consignentMap == null ? null : consignentMap.getId()).setEntId(Long.parseLong(bo.getConsignCompanyId())).setContacts(bo.getConsignContacts()).setPhone(bo.getConsignContactPhone()).setCreateBy(LoginUserHolder.getUserId()).setCreateTime(new Date()).setUpdateBy(LoginUserHolder.getUserId()).setUpdateTime(new Date()).setContactsId(Long.parseLong(bo.getConsignContactsId()));
         logisticsOrderUnitMapper.insert(consignUnit);
     }
 
@@ -611,9 +563,7 @@ public class AcceptCarriageOrderService {
      * @param orderStatus    当前单据状态
      * @param logisticsOrder 父级物流订单
      */
-    private void insertSubcontractLogisticsOrder(SubcontractConsignmentDTO bo, String lOrderNo,
-                                                 KwtLogisticsOrder order,
-                                                 Long orderId, String pids, Integer orderStatus, KwtLogisticsOrder logisticsOrder) {
+    private void insertSubcontractLogisticsOrder(SubcontractConsignmentDTO bo, String lOrderNo, KwtLogisticsOrder order, Long orderId, String pids, Integer orderStatus, KwtLogisticsOrder logisticsOrder) {
         order.setId(orderId);
         order.setEntId(LoginUserHolder.getEntId());
         order.setType(logisticsOrder.getType());
@@ -626,17 +576,14 @@ public class AcceptCarriageOrderService {
         order.setPids(pids);
         order.setSettlementCycle(bo.getSettlementCycle());
         order.setPrice(bo.getPrice());
-        order.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
-                null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
+        order.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ? null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
         order.setAmount(bo.getCarryingCapacity());
         order.setBillingMode(bo.getBillingMode());
         order.setLoss(bo.getLoss());
 //        order.setLossUnit(bo.getLossUnit());
-        order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ?
-                null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
+        order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ? null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
         order.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
-        order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ?
-                null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
+        order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ? null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
 //        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
         order.setStartTime(bo.getShipmentsDateTime() == null ? null : DateUtil.localDateToLocalDateTimeStart(bo.getShipmentsDateTime()));
         order.setEndTime(bo.getReceiveGoodsDateTime() == null ? null : DateUtil.localDateToLocalDateTimeEnd(bo.getReceiveGoodsDateTime()));
@@ -703,11 +650,8 @@ public class AcceptCarriageOrderService {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return result;
         }
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                        .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                /*.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/
-        );
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId()).eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
+                /*.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
         if (logisticsOrder == null) {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             result.setMsg("单据不存在!");
@@ -718,8 +662,7 @@ public class AcceptCarriageOrderService {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return result;
         }
-        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                .eq(KwtLogisticsOrderContract::getLOrderId, orderDTO.getLOrderId()));
+        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>().eq(KwtLogisticsOrderContract::getLOrderId, orderDTO.getLOrderId()));
         if (contract == null) {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             result.setMsg("该订单并未存在合同信息!");
@@ -756,51 +699,28 @@ public class AcceptCarriageOrderService {
         } else if (NumberConstant.ZERO == status) {
             orderStatus = LogisticsOrderEnum.WAIT_DELIVERY.getCode();
         } else {
-            log.info("接单 物流订单id:{}," +
-                            "物流订单编号:{},合同id:{},合同信息:{}",
-                    orderDTO.getLOrderId(), orderDTO.getLOrderNo(),
-                    contract.getContractId(), JSONObject.toJSONString(infoResDto));
+            log.info("接单 物流订单id:{}," + "物流订单编号:{},合同id:{},合同信息:{}", orderDTO.getLOrderId(), orderDTO.getLOrderNo(), contract.getContractId(), JSONObject.toJSONString(infoResDto));
             throw new RuntimeException("物流订单-接单异常");
         }
         if (orderDTO.getType()) {
             //修改单据状态
-            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                    .set(KwtLogisticsOrder::getStatus, orderStatus)
-                    .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
+            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>().eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId()).eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo()).set(KwtLogisticsOrder::getStatus, orderStatus).set(KwtLogisticsOrder::getUpdateTime, new Date()).set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
             /**消息列表推送*/
             Long id = logisticsOrder.getId();
-            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
 //            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
 //                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
 //                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
-                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
+            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
         } else {
             orderStatus = LogisticsOrderEnum.REJECT_ORDER.getCode();
             //todo 改为拒绝接单  数据统计在页面已退回状态中
-            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                    .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                    .set(KwtLogisticsOrder::getStatus, orderStatus)
-                    .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
+            logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>().eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId()).eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo()).set(KwtLogisticsOrder::getStatus, orderStatus).set(KwtLogisticsOrder::getUpdateTime, new Date()).set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
 
             /**数据回退至贸易订单/上级物流订单*/
             if (logisticsOrder.getPid() != null) {
-                KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(KwtLogisticsOrder::getId, logisticsOrder.getPid())
-                );
+                KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, logisticsOrder.getPid()));
                 if (kwtLogisticsOrder != null) {
                     kwtLogisticsOrder.setEntrustAmount(kwtLogisticsOrder.getEntrustAmount().subtract(logisticsOrder.getAmount()));
                     kwtLogisticsOrder.setSubcontractAmount(kwtLogisticsOrder.getSubcontractAmount().subtract(logisticsOrder.getAmount()));
@@ -840,24 +760,15 @@ public class AcceptCarriageOrderService {
 
             /**消息列表推送*/
             Long id = logisticsOrder.getId();
-            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                    .eq(KwtLogisticsOrderUnit::getLOrderId, id)
-                    .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+            KwtLogisticsOrderUnit consignOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+            KwtLogisticsOrderUnit carriageOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(KwtLogisticsOrderUnit::getLOrderId, id).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
 //            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
 //                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
 //                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
-                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
+            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
         }
         //状态表新增状态数据
-        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, orderDTO.getLOrderId()).eq(KwtLogisticsOrderTrack::getStatus, orderStatus));
+        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, orderDTO.getLOrderId()).eq(KwtLogisticsOrderTrack::getStatus, orderStatus));
         if (track == null) {
             KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
             orderTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -899,14 +810,10 @@ public class AcceptCarriageOrderService {
      */
     public HttpResult getWaybillData(String wOrderId) {
         SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(Long.parseLong(wOrderId), SckwWaybillOrder.class);
-        KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>()
-                .eq(KwtWaybillOrder::getId, wOrderId));
-        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, waybillOrder.getLOrderId()));
+        KwtWaybillOrder waybillOrder = waybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>().eq(KwtWaybillOrder::getId, wOrderId));
+        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, waybillOrder.getLOrderId()));
         SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TAX_RATE_TYPE.getType(), kwtLogisticsOrder.getLossUnit());
-        List<KwtWaybillOrderTicket> kwtWaybillOrderTickets = waybillOrderTicketMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
-                .eq(KwtWaybillOrderTicket::getWOrderId, Long.parseLong(wOrderId))
-        );
+        List<KwtWaybillOrderTicket> kwtWaybillOrderTickets = waybillOrderTicketMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTicket>().eq(KwtWaybillOrderTicket::getWOrderId, Long.parseLong(wOrderId)));
         WaybillDetailVO vo = new WaybillDetailVO();
         vo.setSendCarWeigh(waybillOrder.getEntrustAmount());
         vo.setLoadAmount(waybillOrder.getLoadAmount());
@@ -1283,12 +1190,7 @@ public class AcceptCarriageOrderService {
                     jsonObject.put("status", HttpStatus.GLOBAL_EXCEPTION_CODE);
                     jsonObject.put("message", "单据不存在或者单据异常");
                 } else {
-                    logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
-                            .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
-                            .eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId)
-                    );
+                    logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>().set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE).set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderCirculate::getUpdateTime, new Date()).eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId));
                     /**更新MongoDB*/
                     SckwWaybillOrder order = new SckwWaybillOrder();
                     order.setStatus(NumberConstant.ONE);
@@ -1319,12 +1221,7 @@ public class AcceptCarriageOrderService {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("circulateId", circulateId);
 
-                logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
-                        .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                        .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
-                        .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
-                        .eq(KwtLogisticsOrderCirculate::getId, circulateId)
-                );
+                logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>().set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE).set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderCirculate::getUpdateTime, new Date()).eq(KwtLogisticsOrderCirculate::getId, circulateId));
                 /**更新MongoDB*/
                 SckwWaybillOrder order = new SckwWaybillOrder();
                 order.set_id(circulateId);
@@ -1466,8 +1363,7 @@ public class AcceptCarriageOrderService {
         /**完结订单 不做页面填写数量与数据库数量进行计算验证-直接获取页面填写数据进行保存处理*/
         //物流订单id
         String id = orderFinishDTO.getId();
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, id));
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, id));
         if (logisticsOrder == null) {
             throw new RuntimeException("承运订单-完结订单-物流单据不存在!");
         }
@@ -1485,8 +1381,7 @@ public class AcceptCarriageOrderService {
 //            throw new BusinessException("完结订单,填写卸货量不能大于装货量");
 //        }
         /**订单状态验证*/
-        if (!LogisticsOrderEnum.WAIT_DELIVERY.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))
-                && !LogisticsOrderEnum.IN_TRANSIT.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))) {
+        if (!LogisticsOrderEnum.WAIT_DELIVERY.getStatus().equals(String.valueOf(logisticsOrder.getStatus())) && !LogisticsOrderEnum.IN_TRANSIT.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))) {
             throw new RuntimeException("当前订单并不属于【待派车】,【运输中】状态");
         }
         /**完结拦截*/
@@ -1509,9 +1404,7 @@ public class AcceptCarriageOrderService {
         updateDataByItself(logisticsOrder, orderFinishDTO, ignoreAmount);
         //获取物流订单下的子单
         /**完结订单-对应物流订单下子订单都要进行完结*/
-        List<KwtLogisticsOrder> kwtLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
-                .apply(id != null, "FIND_IN_SET ('" + id + "', pids)").ne(KwtLogisticsOrder::getId, id));
+        List<KwtLogisticsOrder> kwtLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO).apply(id != null, "FIND_IN_SET ('" + id + "', pids)").ne(KwtLogisticsOrder::getId, id));
         /**找到该订单下所有的物流订单**/
         //需要修改的mongodb数据
         List<Map<String, Object>> list = new ArrayList<>();
@@ -1531,7 +1424,7 @@ public class AcceptCarriageOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
+        if (logisticsOrder.getPid() == null && ("1".equals(logisticsOrder.getType()))) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为传递页面传输值  不传递总量
@@ -1543,9 +1436,7 @@ public class AcceptCarriageOrderService {
             orderStatusList.add(LogisticsOrderEnum.PENDING_ORDER.getCode());
             orderStatusList.add(LogisticsOrderEnum.WAIT_DELIVERY.getCode());
             orderStatusList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
-            List<KwtLogisticsOrder> logisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                    .eq(KwtLogisticsOrder::getTOrderId, logisticsOrder.getTOrderId())
-                    .in(KwtLogisticsOrder::getStatus, orderStatusList));
+            List<KwtLogisticsOrder> logisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, logisticsOrder.getTOrderId()).in(KwtLogisticsOrder::getStatus, orderStatusList));
             if (org.springframework.util.CollectionUtils.isEmpty(logisticsOrders)) {
                 tradeOrder.setIsAllComplete(true);
             } else {
@@ -1620,23 +1511,10 @@ public class AcceptCarriageOrderService {
 
     private void updateLogisticOrderAndTrack(Long lOrderId, OrderFinishDTO orderFinishDTO, BigDecimal ignoreAmount) {
         Integer code = LogisticsOrderEnum.HAVE_FINISHED.getCode();
-        logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
-                .set(KwtLogisticsOrder::getStatus, code)
-                .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
-                .set(KwtLogisticsOrder::getIgnoreAmount, ignoreAmount)
-                .set(KwtLogisticsOrder::getUpdateTime, new Date())
-                .eq(KwtLogisticsOrder::getId, lOrderId)
-        );
-        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, lOrderId).eq(KwtLogisticsOrderTrack::getStatus, code)
-        );
+        logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>().set(KwtLogisticsOrder::getStatus, code).set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrder::getIgnoreAmount, ignoreAmount).set(KwtLogisticsOrder::getUpdateTime, new Date()).eq(KwtLogisticsOrder::getId, lOrderId));
+        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, lOrderId).eq(KwtLogisticsOrderTrack::getStatus, code));
         if (track != null) {
-            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>()
-                    .set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId())
-                    .set(KwtLogisticsOrderTrack::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark())
-                    .eq(KwtLogisticsOrderTrack::getId, track.getId())
-            );
+            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>().set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderTrack::getUpdateTime, new Date()).set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark()).eq(KwtLogisticsOrderTrack::getId, track.getId()));
         } else {
             KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
             orderTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -1701,16 +1579,9 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setTotalUnloadAmount(orderFinishDTO.getUnloadAmount());
         logisticsOrder.setIgnoreAmount(ignoreAmount);
         logisticsOrderMapper.updateById(logisticsOrder);
-        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderTrack::getStatus, LogisticsOrderEnum.HAVE_FINISHED.getCode())
-        );
+        KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, logisticsOrder.getId()).eq(KwtLogisticsOrderTrack::getStatus, LogisticsOrderEnum.HAVE_FINISHED.getCode()));
         if (track != null) {
-            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>()
-                    .set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId())
-                    .set(KwtLogisticsOrderTrack::getUpdateTime, new Date())
-                    .set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark())
-                    .eq(KwtLogisticsOrderTrack::getId, track.getId())
-            );
+            logisticsOrderTrackMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderTrack>().set(KwtLogisticsOrderTrack::getUpdateBy, LoginUserHolder.getUserId()).set(KwtLogisticsOrderTrack::getUpdateTime, new Date()).set(KwtLogisticsOrderTrack::getRemark, orderFinishDTO.getRemark()).eq(KwtLogisticsOrderTrack::getId, track.getId()));
         } else {
             KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
             orderTrack.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -1748,8 +1619,7 @@ public class AcceptCarriageOrderService {
      * @param orderId        分包物流订单id
      */
     private void updateDataBySubset(OrderFinishDTO orderFinishDTO, String orderId) {
-        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .eq(KwtLogisticsOrder::getId, Long.parseLong(orderId)));
+        KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, Long.parseLong(orderId)));
         if (kwtLogisticsOrder != null) {
             kwtLogisticsOrder.setStatus(LogisticsOrderEnum.HAVE_FINISHED.getCode());
             kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
@@ -1768,12 +1638,7 @@ public class AcceptCarriageOrderService {
             logisticsOrderTrackMapper.insert(track);
             /**单据完结修改Mongodb*/
             SckwLogisticsOrder updateParam = new SckwLogisticsOrder();
-            updateParam.setLOrderId(kwtLogisticsOrder.getId())
-                    .setStatus(LogisticsOrderEnum.HAVE_FINISHED.getStatus())
-                    .setUpdateBy(LoginUserHolder.getUserId())
-                    .setUpdateByName(LoginUserHolder.getUserName())
-                    .setUpdateTime(new Date())
-            ;
+            updateParam.setLOrderId(kwtLogisticsOrder.getId()).setStatus(LogisticsOrderEnum.HAVE_FINISHED.getStatus()).setUpdateBy(LoginUserHolder.getUserId()).setUpdateByName(LoginUserHolder.getUserName()).setUpdateTime(new Date());
             SckwBusSum busSum = new SckwBusSum();
             busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
             busSum.setMethod(2);
@@ -1807,29 +1672,18 @@ public class AcceptCarriageOrderService {
      * @return
      */
     public HttpResult subcontractConsignmentOrderDetail(String id) {
-        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                        .eq(KwtLogisticsOrder::getId, Long.parseLong(id))
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getId, Long.parseLong(id))
                 /**.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/);
         if (logisticsOrder == null) {
             log.info("查无单据 物流订单id:{}", id);
             throw new RuntimeException("查无单据");
         }
-        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderContract::getLOrderId, Long.parseLong(id)));
-        KwtLogisticsOrderUnit unitOne = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
-        KwtLogisticsOrderUnit unitTwo = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
-        KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
-        KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                .eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id))
-                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
-        KwtLogisticsOrderGoods orderGoods = kwtLogisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
-                .eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
+        KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderContract::getLOrderId, Long.parseLong(id)));
+        KwtLogisticsOrderUnit unitOne = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+        KwtLogisticsOrderUnit unitTwo = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderUnit::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+        KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>().eq(StringUtils.isNotBlank(Long.parseLong(id)), KwtLogisticsOrderAddress::getLOrderId, Long.parseLong(id)).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderGoods orderGoods = kwtLogisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>().eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
         OrderDetailVO orderDetailVO = new OrderDetailVO();
         orderDetailVO.setRemark(logisticsOrder.getRemark());
         orderDetailVO.setTaxRate(logisticsOrder.getTaxRate());
@@ -1886,14 +1740,12 @@ public class AcceptCarriageOrderService {
 //        orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : logisticsOrder.getLoadAmount());
         if (logisticsOrder.getSettlementCycle() != null) {
             Map<String, SysDictResDto> dtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null :
-                    (dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())) == null ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel()));
+            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null : (dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())) == null ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel()));
         }
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
         if (logisticsOrder.getBillingMode() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.CHARGING_TYPE.getType());
-            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null :
-                    (dictResDtoMap.get(logisticsOrder.getBillingMode()) == null ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel()));
+            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null : (dictResDtoMap.get(logisticsOrder.getBillingMode()) == null ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel()));
         }
         if (logisticsOrder.getPayment() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
@@ -2042,12 +1894,7 @@ public class AcceptCarriageOrderService {
 //        commonService.publicLogisticsConsignmentPushMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
 //                , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER);
 
-        commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
-                , messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
-                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl()
-                , MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER
-                , "1"
-        );
+        commonService.newSendLogisticsOrderToMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId(), messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(), MessageEnum.NEW_LOGISTICS_ORDER, MessageEnum.NEW_CARRIAGE_ORDER, "1");
 
 //        System.out.println("承运订单新建订单-消息列表推送 end ");
         return HttpResult.ok();
@@ -2380,10 +2227,8 @@ public class AcceptCarriageOrderService {
         order.setLossUnit(orderDTO.getLossUnit());
         order.setGoodsPrice(orderDTO.getGoodsPrice() == null ? null : orderDTO.getGoodsPrice());
         order.setGoodsPriceUnit(orderDTO.getGoodsPriceUnit());
-        order.setStartTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getStartTime()) ?
-                null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
-        order.setEndTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getEndTime()) ?
-                null : DateUtil.localDateToLocalDateTimeEnd(orderDTO.getEndTime()));
+        order.setStartTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getStartTime()) ? null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
+        order.setEndTime(org.apache.commons.lang3.ObjectUtils.isEmpty(orderDTO.getEndTime()) ? null : DateUtil.localDateToLocalDateTimeEnd(orderDTO.getEndTime()));
         BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
         order.setSubcontractAmount(decimal);
         order.setEntrustAmount(decimal);
@@ -2428,20 +2273,16 @@ public class AcceptCarriageOrderService {
         String loadCode = query.getLoadAddressCode();
         if (StringUtils.isNotBlank(loadCode)) {
             switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setLoadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setLoadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setLoadAddressCode(loadCode);
             }
         }
         String unloadCode = query.getUnloadAddressCode();
         if (StringUtils.isNotBlank(unloadCode)) {
             switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setUnloadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setUnloadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
@@ -2556,20 +2397,16 @@ public class AcceptCarriageOrderService {
         String loadCode = query.getLoadAddressCode();
         if (StringUtils.isNotBlank(loadCode)) {
             switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setLoadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setLoadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setLoadAddressCode(loadCode);
             }
         }
         String unloadCode = query.getUnloadAddressCode();
         if (StringUtils.isNotBlank(unloadCode)) {
             switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setUnloadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setUnloadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
@@ -2627,10 +2464,7 @@ public class AcceptCarriageOrderService {
     }
 
     public HttpResult getOrderTrackByOrderId(String orderId, String number) {
-        List<KwtLogisticsOrderTrack> list = logisticsOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
-                .eq(KwtLogisticsOrderTrack::getLOrderId, orderId)
-                .eq(KwtLogisticsOrderTrack::getDelFlag, NumberConstant.ZERO).orderByDesc(KwtLogisticsOrderTrack::getCreateTime)
-        );
+        List<KwtLogisticsOrderTrack> list = logisticsOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderTrack>().eq(KwtLogisticsOrderTrack::getLOrderId, orderId).eq(KwtLogisticsOrderTrack::getDelFlag, NumberConstant.ZERO).orderByDesc(KwtLogisticsOrderTrack::getCreateTime));
         List<LogisticsOrderTrackVO> vos = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             List<Long> collect = list.stream().map(KwtLogisticsOrderTrack::getCreateBy).collect(Collectors.toList());
@@ -2687,20 +2521,16 @@ public class AcceptCarriageOrderService {
         String loadCode = query.getLoadAddressCode();
         if (StringUtils.isNotBlank(loadCode)) {
             switch (query.getLoadAddressLevel()) {
-                case 1 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setLoadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setLoadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setLoadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setLoadAddressCode(loadCode);
             }
         }
         String unloadCode = query.getUnloadAddressCode();
         if (StringUtils.isNotBlank(unloadCode)) {
             switch (query.getUnloadAddressLevel()) {
-                case 1 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
-                case 2 -> query.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
+                case 1 -> query.setUnloadAddressCode(loadCode.substring(0, 2).trim());
+                case 2 -> query.setUnloadAddressCode(loadCode.substring(0, 4).trim());
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
@@ -2915,8 +2745,7 @@ public class AcceptCarriageOrderService {
     private void computeCompareTotalPrice(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
         BigDecimal chainRatio = new BigDecimal("0.00");
-        if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0
-                && lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
+        if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0 && lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("0.00");
         } else if (currentWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
@@ -2924,8 +2753,7 @@ public class AcceptCarriageOrderService {
         } else if (lastWeek.getTotalPrice().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("100.00").subtract(chainRatio);
         } else {
-            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
-                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+            chainRatio = (currentWeek.getTotalPrice().subtract(lastWeek.getTotalPrice())).divide(lastWeek.getTotalPrice(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -2942,8 +2770,7 @@ public class AcceptCarriageOrderService {
     private void computeCompareAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer amountFlag = 1;
         BigDecimal amountChainRatio = new BigDecimal("0.00");
-        if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0
-                && lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
+        if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0 && lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
             amountChainRatio = new BigDecimal("0.00");
         } else if (currentWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
             amountChainRatio = amountChainRatio.subtract(new BigDecimal("100.00"));
@@ -2951,8 +2778,7 @@ public class AcceptCarriageOrderService {
         } else if (lastWeek.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
             amountChainRatio = new BigDecimal("100.00").subtract(amountChainRatio);
         } else {
-            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
-                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+            amountChainRatio = (currentWeek.getAmount().subtract(lastWeek.getAmount())).divide(lastWeek.getAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (amountChainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             amountFlag = 2;
@@ -2971,8 +2797,7 @@ public class AcceptCarriageOrderService {
     private void computeCompareWaitingAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
         BigDecimal chainRatio = new BigDecimal("0.00");
-        if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0
-                && lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
+        if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0 && lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("0.00");
         } else if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = chainRatio.subtract(new BigDecimal("100.00"));
@@ -2980,8 +2805,7 @@ public class AcceptCarriageOrderService {
         } else if (lastWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0) {
             chainRatio = new BigDecimal("100.00").subtract(chainRatio);
         } else {
-            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP)
-                    .multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
+            chainRatio = (currentWeek.getWaitingAmount().subtract(lastWeek.getWaitingAmount())).divide(lastWeek.getWaitingAmount(), NumberConstant.SIX, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00")).setScale(NumberConstant.TWO, BigDecimal.ROUND_HALF_UP);
         }
         if (chainRatio.compareTo(new BigDecimal("0.00")) == -1) {
             flag = 2;
@@ -3030,15 +2854,14 @@ public class AcceptCarriageOrderService {
             //结束时间
             String dateEnd = cn.hutool.core.date.DateUtil.format(dateTime, DEF_DATE_FORMAT);
 
-            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
-                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList, OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
@@ -3056,15 +2879,14 @@ public class AcceptCarriageOrderService {
             }
             //结束时间
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
-            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
-                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList, OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));

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

@@ -278,7 +278,7 @@ public class CommonService {
         } else {
             sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
-            if (type.equals("1")) {
+            if ("1".equals(type)) {
                 map.put("companyName", consignUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {
@@ -312,12 +312,13 @@ public class CommonService {
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
-        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(),messageEnum.getContent(),name,JSON.toJSONString(msg));
+        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(), messageEnum.getContent(), name, JSON.toJSONString(msg));
         streamBridge.send("sckw-message", JSON.toJSONString(msg));
     }
 
     /**
      * 给业务联系人发消息[承运方]
+     *
      * @param carriageUnit
      * @param map
      * @param pcUrl
@@ -343,12 +344,13 @@ public class CommonService {
                 .setUserInfos(userInfoList)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
-        log.info("[承运方]-companyName：{}-消息：{}", carriageUnit.getFirmName(),messageEnum.getContent());
+        log.info("[承运方]-companyName：{}-消息：{}", carriageUnit.getFirmName(), messageEnum.getContent());
         streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
     }
 
     /**
      * 给业务联系人发消息[托运方]
+     *
      * @param consignUnit
      * @param map
      * @param pcUrl
@@ -374,7 +376,7 @@ public class CommonService {
                 .setUserInfos(list)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[托运方]-业务联系人：{}", JSON.toJSONString(message));
-        log.info("[托运方]-companyName：{}-消息：{}", consignUnit.getFirmName(),messageEnum.getContent());
+        log.info("[托运方]-companyName：{}-消息：{}", consignUnit.getFirmName(), messageEnum.getContent());
         streamBridge.send("sckw-message", JSON.toJSONString(message));
     }
 

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

@@ -916,7 +916,7 @@ public class ConsignOrderService {
             });
         }
         /**是否是一级订单,是->推送至贸易,否,数据推送至物流订单上级*/
-        if (logisticsOrder.getPid() == null && logisticsOrder.getType().equals("1")) {
+        if (logisticsOrder.getPid() == null && ("1".equals(logisticsOrder.getType()))) {
             //数据推送至贸易订单
             CompleteLogisticsOrderParam tradeOrder = new CompleteLogisticsOrderParam();
             //todo 2023-09-07 修改为不传递总量，只传递当前单据页面传递值
@@ -2322,13 +2322,13 @@ public class ConsignOrderService {
 
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
@@ -2348,13 +2348,13 @@ public class ConsignOrderService {
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
-            if (logisticsOrderStatistics.getTypeOne().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeOne())) {
                 list.forEach(vo -> {
                     vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
                 });
             }
-            if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
+            if ("2".equals(logisticsOrderStatistics.getTypeTwo())) {
                 list.forEach(vo -> {
                     vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
                     vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));