无收货人的订单下载应收汇总时错误信息兼容

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/merge/MergeServiceImpl.java

@@ -343,7 +343,9 @@ public class MergeServiceImpl extends AbstractService<MergeMapper, MergeDO> impl
                     }
                 });
                 OrderDO orderDO = OrderConvert.INSTANCE.convert(mergedOrderDO);
-                orderDO.setOrderConsigneeDO(OrderConsigneeConvert.INSTANCE.convert(mergedOrderDO.getConsigneeVO()));
+                if (Objects.nonNull((mergedOrderDO.getConsigneeVO()))) {
+                    orderDO.setOrderConsigneeDO(OrderConsigneeConvert.INSTANCE.convert(mergedOrderDO.getConsigneeVO()));
+                }
                 orderDO.setOrderConsignorDO(OrderConsignorConvert.INSTANCE.convert(mergedOrderDO.getConsignorVO()));
                 orderDO.setOrderDepartureDO(OrderDepartureConvert.INSTANCE.convert(mergedOrderDO.getOrderDepartureVO()));
                 orderDO.setOrderObjectiveDO(OrderObjectiveConvert.INSTANCE.convert(mergedOrderDO.getOrderObjectiveVO()));
@@ -500,7 +502,9 @@ public class MergeServiceImpl extends AbstractService<MergeMapper, MergeDO> impl
                 //设置合单后的新订单的字段为原申请单的字段
                 OrderBackVO orderBackVO = orderQueryService.getOrder(orderDO2.getOrderId());
                 OrderDO orderDO = OrderConvert.INSTANCE.convert(orderBackVO);
-                orderDO.setOrderConsigneeDO(OrderConsigneeConvert.INSTANCE.convert(orderBackVO.getConsigneeVO()));
+                if (Objects.nonNull(orderBackVO.getConsigneeVO())) {
+                    orderDO.setOrderConsigneeDO(OrderConsigneeConvert.INSTANCE.convert(orderBackVO.getConsigneeVO()));
+                }
                 orderDO.setOrderConsignorDO(OrderConsignorConvert.INSTANCE.convert(orderBackVO.getConsignorVO()));
                 orderDO.setOrderDepartureDO(OrderDepartureConvert.INSTANCE.convert(orderBackVO.getOrderDepartureVO()));
                 orderDO.setOrderObjectiveDO(OrderObjectiveConvert.INSTANCE.convert(orderBackVO.getOrderObjectiveVO()));

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -5840,7 +5840,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         OrderConsignorDO orderConsignorDO = orderConsignorService.getById(consignorVO.getId());
         OrderConsigneeDO orderConsigneeDO = null;
         if (Objects.nonNull(consigneeVO)) {
-            orderConsigneeService.getById(consigneeVO.getId());
+            orderConsigneeDO = orderConsigneeService.getById(consigneeVO.getId());
         }
         //
         boolean isConsignorChange = orderConsignorDO != null && !Objects.equals(consignorVO.getCustomerId(), orderConsignorDO.getCustomerId());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java

@@ -225,9 +225,11 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
         OrderBackInfoDto info = orderQueryService.info(orderService.selectOne(OrderDO::getOrderNo, orderPickupDO.getOrderId()).getOrderId());
         if (info.getSumNum() != 0) {
             //客户等级日志
-            customerLevelLogService.deleteLevelLogAndUpdateCustomer(info.getConsigneeVO().getCustomerId(), info.getOrderId(), info.getOrderNo());
+            if (Objects.nonNull(info.getConsigneeVO())) {
+                customerLevelLogService.deleteLevelLogAndUpdateCustomer(info.getConsigneeVO().getCustomerId(), info.getOrderId(), info.getOrderNo());
+            }
             customerCreditLogService.deleteCreditLogAndUpdateCustomer(info.getConsigneeVO().getCustomerId(), info.getOrderId(), info.getOrderNo());
-            if (info.getConsigneeVO().getCustomerId().longValue() != info.getConsignorVO().getCustomerId().longValue()) {
+            if (Objects.nonNull(info.getConsigneeVO()) && info.getConsigneeVO().getCustomerId().longValue() != info.getConsignorVO().getCustomerId().longValue()) {
                 customerLevelLogService.deleteLevelLogAndUpdateCustomer(info.getConsignorVO().getCustomerId(), info.getOrderId(), info.getOrderNo());
                 customerCreditLogService.deleteCreditLogAndUpdateCustomer(info.getConsignorVO().getCustomerId(), info.getOrderId(), info.getOrderNo());
             }
@@ -236,7 +238,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
 
     private void insertCustomLevelAndCreditLevelLog(OrderPickupDO orderPickupDO, OrderDO orderDO, boolean flag) {
         OrderBackInfoDto info = orderQueryService.info(orderDO.getOrderId());
-        if (orderDO.getSumNum() != 0) {
+        if (orderDO.getSumNum() != 0 && Objects.nonNull(info.getConsigneeVO())) {
             //客户等级日志
             double percent = (orderPickupDO.getPickNum().doubleValue() / orderDO.getSumNum().doubleValue()) * 100;
             if (percent >= 80 && percent < 90) {
@@ -544,7 +546,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
         // 提货成功后更新发货人的等级
         OrderBackInfoDto info = orderQueryService.info(orderDO.getOrderId());
         BigDecimal sumVolume = info.getSumVolume();
-        if (sumVolume != null && sumVolume.compareTo(BigDecimal.ONE) == 1) {
+        if (sumVolume != null && sumVolume.compareTo(BigDecimal.ONE) == 1 && Objects.nonNull(info.getConsigneeVO())) {
             customerLevelLogService.createLevelLogAndUpdateCustomer(info.getConsignorVO().getCustomerId(), sumVolume, info.getOrderId(), info.getOrderNo(), null);
             if (info.getConsignorVO().getCustomerId().longValue() != info.getConsigneeVO().getCustomerId().longValue()) {
                 customerLevelLogService.createLevelLogAndUpdateCustomer(info.getConsigneeVO().getCustomerId(), sumVolume, info.getOrderId(), info.getOrderNo(), null);

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderSplit/OrderSplitServiceImpl.java

@@ -930,9 +930,10 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
 
                 OrderConsignorDO orderConsignorDO = OrderConsignorConvert.INSTANCE.convert(parentOrderBackVo.getConsignorVO());
                 orderDO.setOrderConsignorDO(orderConsignorDO);
-
-                OrderConsigneeDO orderConsigneeDO = OrderConsigneeConvert.INSTANCE.convert(parentOrderBackVo.getConsigneeVO());
-                orderDO.setOrderConsigneeDO(orderConsigneeDO);
+                if (Objects.nonNull(parentOrderBackVo.getConsigneeVO())) {
+                    OrderConsigneeDO orderConsigneeDO = OrderConsigneeConvert.INSTANCE.convert(parentOrderBackVo.getConsigneeVO());
+                    orderDO.setOrderConsigneeDO(orderConsigneeDO);
+                }
 
                 OrderDepartureDO orderDepartureDO = OrderDepartureConvert.INSTANCE.convert(parentOrderBackVo.getOrderDepartureVO());
                 orderDO.setOrderDepartureDO(orderDepartureDO);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/AirBillReceivableExcelExportListener.java

@@ -225,11 +225,11 @@ public class AirBillReceivableExcelExportListener {
                     Long orderId = entry.getKey();
                     OrderBackInfoDto orderInfo = orderQueryService.info(orderId);
                     Map<String, Object> map = new HashMap<>();
-                    map.put("consigneeName", orderInfo.getConsigneeVO().getName());
+                    map.put("consigneeName", Objects.nonNull(orderInfo.getConsigneeVO())? orderInfo.getConsigneeVO().getName():"");
                     map.put("mark", orderInfo.getMarks());
                     map.put("orderNo", orderInfo.getOrderNo());
                     map.put("tidanNo", orderInfo.getTidanNo());
-                    map.put("consigneePhone", "+"+orderInfo.getConsigneeVO().getCountryCode()+orderInfo.getConsigneeVO().getPhone());
+                    map.put("consigneePhone", Objects.nonNull(orderInfo.getConsigneeVO())? ("+".concat(orderInfo.getConsigneeVO().getCountryCode()).concat(orderInfo.getConsigneeVO().getPhone())): "");
 //                    //todo 计算应收明细的核销比例,待测试，未减优惠金额
                     List<ReceivableOrderPayedFeeTypeVO> payedFeeTypeVOList = receivableService.getPayedMoneyByFeeType(orderId);
                     //应收运费

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentReceivableExcelExportListener.java

@@ -156,12 +156,12 @@ public class ShipmentReceivableExcelExportListener {
                     Long orderId = entry.getKey();
                     OrderBackInfoDto orderInfo = orderQueryService.info(orderId);
                     Map<String, Object> map = new HashMap<>();
-                    map.put("consigneeName", orderInfo.getConsigneeVO().getName());
+                    map.put("consigneeName", Objects.nonNull(orderInfo.getConsigneeVO())? orderInfo.getConsigneeVO().getName():"");
                     map.put("mark", orderInfo.getMarks());
                     map.put("orderNo", orderInfo.getOrderNo());
-                    map.put("consigneePhone", "+"+orderInfo.getConsigneeVO().getCountryCode()+orderInfo.getConsigneeVO().getPhone());
-                    map.put("consigneeEmail", orderInfo.getConsigneeVO().getEmail());
-                    map.put("consigneeAddress", orderInfo.getConsigneeVO().getAddress());
+                    map.put("consigneePhone", Objects.nonNull(orderInfo.getConsigneeVO())? ("+".concat(orderInfo.getConsigneeVO().getCountryCode()).concat(orderInfo.getConsigneeVO().getPhone())): "");
+                    map.put("consigneeEmail", Objects.nonNull(orderInfo.getConsigneeVO())? orderInfo.getConsigneeVO().getEmail():"");
+                    map.put("consigneeAddress", Objects.nonNull(orderInfo.getConsigneeVO())? orderInfo.getConsigneeVO().getAddress():"");
                     map.put("pickNum", boxPreloadGoodsService.getLadingBillNo(orderId));
                     //todo 计算应收明细的核销比例,待测试，未减优惠金额
                     List<ReceivableOrderPayedFeeTypeVO> payedFeeTypeVOList=receivableService.getPayedMoneyByFeeType(orderId);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentReceivableExcelExportListener2.java

@@ -299,11 +299,11 @@ public class ShipmentReceivableExcelExportListener2 {
                     Long orderId = entry.getKey();
                     OrderBackInfoDto orderInfo = orderQueryService.info(orderId);
                     Map<String, Object> map = new HashMap<>();
-                    map.put("consigneeName", orderInfo.getConsigneeVO().getName());
+                    map.put("consigneeName", Objects.nonNull(orderInfo.getConsigneeVO())? orderInfo.getConsigneeVO().getName():"");
                     map.put("mark", orderInfo.getMarks());
                     map.put("orderNo", orderInfo.getOrderNo());
                     map.put("tidanNo", orderInfo.getTidanNo());
-                    map.put("consigneePhone", "+" + orderInfo.getConsigneeVO().getCountryCode() + orderInfo.getConsigneeVO().getPhone());
+                    map.put("consigneePhone", Objects.nonNull(orderInfo.getConsigneeVO())? ("+".concat(orderInfo.getConsigneeVO().getCountryCode()).concat(orderInfo.getConsigneeVO().getPhone())): "");
                     //todo 计算应收明细的核销比例,待测试，未减优惠金额
                     List<ReceivableOrderPayedFeeTypeVO> payedFeeTypeVOList = receivableService.getPayedMoneyByFeeType(orderId);
                     //应收运费

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -479,7 +479,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         CustomerDO customer = customerService.getCustomer(info.getCustomerId());
         //订单基本信息
         orderInfoMap.put("consignee", Objects.nonNull(info.getConsigneeVO()) ? info.getConsigneeVO().getName():"");
-        orderInfoMap.put("consigneePhone", Objects.nonNull(info.getConsigneeVO()) ? "+" + info.getConsigneeVO().getCountryCode() + info.getConsigneeVO().getPhone() : "");
+        orderInfoMap.put("consigneePhone", Objects.nonNull(info.getConsigneeVO()) ? ("+".concat(info.getConsigneeVO().getCountryCode()).concat(info.getConsigneeVO().getPhone())) : "");
         orderInfoMap.put("consignor", info.getConsignorVO().getName());
         orderInfoMap.put("consignorPhone", "+" + info.getConsignorVO().getCountryCode() + info.getConsignorVO().getPhone());
         if (info.getDrawee() == 1) {
@@ -711,12 +711,14 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
                 }
             } else {
                 OrderConsigneeBackVO consigneeVO = info.getConsigneeVO();
-                String name = consigneeVO.getName();
-                String nameEn = consigneeVO.getNameEn();
-                if (consigneeVO.getName().equals(consigneeVO.getNameEn()) && !pattern.matcher(consigneeVO.getName()).find()) {
-                    stringBuffer.append(StringUtils.isBlank(name) ? "" : name);
-                } else {
-                    stringBuffer.append(StringUtils.isBlank(name) ? "" : name).append(" ").append(StringUtils.isBlank(nameEn) ? "" : nameEn);
+                if (Objects.nonNull(consigneeVO)) {
+                    String name = consigneeVO.getName();
+                    String nameEn = consigneeVO.getNameEn();
+                    if (consigneeVO.getName().equals(consigneeVO.getNameEn()) && !pattern.matcher(consigneeVO.getName()).find()) {
+                        stringBuffer.append(StringUtils.isBlank(name) ? "" : name);
+                    } else {
+                        stringBuffer.append(StringUtils.isBlank(name) ? "" : name).append(" ").append(StringUtils.isBlank(nameEn) ? "" : nameEn);
+                    }
                 }
             }
         }