Merge branch 'master' into order-update

sql/update_2024-07.sql

@@ -13,17 +13,17 @@ alter table `ecw_order`
 
 
 CREATE TABLE `compare_air_customer_result` (
-                                               `id` bigint NOT NULL AUTO_INCREMENT,
-                                               `number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
-                                               `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
-                                               `phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'phone',
-                                               `old_customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'old_customerName',
-                                               `customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'customerName',
-                                               `enter_open_sea_time` datetime DEFAULT NULL COMMENT '入公海时间',
-                                               `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
-                                               `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                               `type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type',
-                                               PRIMARY KEY (`id`)
+       `id` bigint NOT NULL AUTO_INCREMENT,
+       `number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
+       `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name',
+       `phone` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'phone',
+       `old_customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'old_customerName',
+       `customer_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'customerName',
+       `enter_open_sea_time` datetime DEFAULT NULL COMMENT '入公海时间',
+       `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
+       `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+       `type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type',
+       PRIMARY KEY (`id`)
 ) ENGINE=InnoDB COMMENT='客户比对表结果表';
 
 

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

@@ -2544,7 +2544,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         }
                     } else if (vo.getDrawee() == 2) {//收货人付款   层级5 第一个
                         if (consigneeDO != null) {
-                            vo.setCustomerId(orderConsignorBackVO.getCustomerId());
+                            vo.setCustomerId(orderConsigneeBackVO.getCustomerId());
                         } else {
                             //没有收货人
                             vo.setCustomerId(0L);
@@ -2555,7 +2555,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     } else if (vo.getDrawee() == 3) { //自定义付款
                         List<CustomDraweeVO> list = JSONObject.parseArray(vo.getCustomDrawee(), CustomDraweeVO.class);
                         if (CollectionUtil.isNotEmpty(list)) {
-
                             List<CustomDraweeVO> freightList = list.stream().filter(s -> s.getName().equals("freight")).collect(Collectors.toList());
                             List<CustomDraweeVO> clearanceFeeList = list.stream().filter(s -> s.getName().equals("clearanceFee")).collect(Collectors.toList());
                             int freight = freightList.get(0).getValue();//运费
@@ -2577,7 +2576,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     } else {
                         //业绩归收货人
                         vo.setCustomerId(orderConsigneeBackVO.getCustomerId() != null ? orderConsigneeBackVO.getCustomerId() : 0);
-
                         customerType = 2;
                     }
                 }
@@ -4257,6 +4255,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             case UNLOADED_CABINET:
 //                if (Objects.isNull(currentOrderDO.getUnloadTime())) {
                 currentOrderDO.setUnloadTime(now);
+//                }
+                break;
+            case UNLOADED_CABINET_AIR:
+//                if (Objects.isNull(currentOrderDO.getUnloadTime())) {
+                currentOrderDO.setUnloadTime(now);
 //                }
                 break;
             case PICKED_UP:

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/app/order/MyOrderController.java

@@ -336,8 +336,9 @@ public class MyOrderController {
         OrderBackInfoDto dto = orderQueryService.info(orderId);
         dto.setUserType(UserTypeEnum.MEMBER.getValue());
         if (CollectionUtil.isNotEmpty(dto.getOrderTimeVOList())) {
-            List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new));
-            dto.setOrderTimeVOList(orderTimeVOList.stream().sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList()));
+            List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream()
+                    .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new));
+            dto.setOrderTimeVOList(orderTimeVOList.stream().filter(t -> t.getStatus() != 15 && t.getStatus() != 150330).sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList()));
         }
         return success(dto);
     }

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -3468,29 +3468,29 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 ProductPriceStepDO clear = new ProductPriceStepDO();
                 if (createReqVO.getPriceType() == 1) {
                     if (CollectionUtil.isNotEmpty(respVO.getFullPriceStepList())) {
-                        respVO.getFullPriceStepList().forEach(pack -> {
-                            ProductPriceStepDO priceStepDO = new ProductPriceStepDO();
-                            BeanUtils.copyProperties(pack, priceStepDO);
-                            priceStepDO.setId(null);
-                            priceStepDO.setStartNum(BigDecimal.valueOf(0));
-                            priceStepDO.setEndNum(BigDecimal.valueOf(0));
-                            priceStepDO.setWeightUnit(price.getTransportPriceUnit());
-                            priceStepDO.setAllPrice(respVO.getAllPrice());
-                            priceStepDO.setAllPriceUnit(respVO.getAllPriceUnit());
-                            priceStepDO.setAllVolumeUnit(respVO.getAllVolumeUnit());
-                            if (CollectionUtil.isNotEmpty(respVO.getSpecialList())) {
-                                List<ProductPriceStepSpecialDO> specialList = new ArrayList<>();
-                                respVO.getSpecialList().forEach(sp -> {
-                                    ProductPriceStepSpecialDO specialDO = new ProductPriceStepSpecialDO();
-                                    BeanUtils.copyProperties(sp, specialDO);
-                                    specialDO.setId(null);
-                                    specialList.add(specialDO);
-                                });
-                                priceStepDO.setSpecialList(specialList);
-                            }
-                            fullPriceStepList.add(priceStepDO);
-                        });
-                        createReqVO.setFullPriceStepList(fullPriceStepList);
+//                        respVO.getFullPriceStepList().forEach(pack -> {
+//                            ProductPriceStepDO priceStepDO = new ProductPriceStepDO();
+//                            BeanUtils.copyProperties(pack, priceStepDO);
+//                            priceStepDO.setId(null);
+//                            priceStepDO.setStartNum(BigDecimal.valueOf(0));
+//                            priceStepDO.setEndNum(BigDecimal.valueOf(0));
+//                            priceStepDO.setWeightUnit(price.getTransportPriceUnit());
+//                            priceStepDO.setAllPrice(respVO.getAllPrice());
+//                            priceStepDO.setAllPriceUnit(respVO.getAllPriceUnit());
+//                            priceStepDO.setAllVolumeUnit(respVO.getAllVolumeUnit());
+//                            if (CollectionUtil.isNotEmpty(respVO.getSpecialList())) {
+//                                List<ProductPriceStepSpecialDO> specialList = new ArrayList<>();
+//                                respVO.getSpecialList().forEach(sp -> {
+//                                    ProductPriceStepSpecialDO specialDO = new ProductPriceStepSpecialDO();
+//                                    BeanUtils.copyProperties(sp, specialDO);
+//                                    specialDO.setId(null);
+//                                    specialList.add(specialDO);
+//                                });
+//                                priceStepDO.setSpecialList(specialList);
+//                            }
+//                            fullPriceStepList.add(priceStepDO);
+//                        });
+                        createReqVO.setFullPriceStepList(respVO.getFullPriceStepList());
                     }
                 } else {
 //                    if (CollectionUtil.isEmpty(respVO.getFreightPriceStepList())) {

yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/listener/AchievementDetailExcelListener.java

@@ -69,9 +69,8 @@ public class AchievementDetailExcelListener {
             event.setUrl(fileDO.getUrl());
             event.setFileId(fileDO.getId());
         } catch (Exception e) {
-            log.info("业绩明细导出失败",e);
-            e.printStackTrace();
-            event.setResult(e.getMessage());
+            log.error("业绩明细导出失败",e);
+            event.setResult(e + "");
         }
     }
 }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1914,7 +1914,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             orderService.updateStatus(orderId, null, orderStatus, null, inWarehouseState, shipmentState, auditType, auditResult, businessTime, "出货操作", null);
         }
         // 卸柜/到仓操作时，不在此处更新动态
-        if (TO_WAREHOUSED.getStatus() != shipmentState) {
+        if (Objects.nonNull(shipmentState) && TO_WAREHOUSED.getStatus() != shipmentState) {
             this.shipmentAirOrderTimeLog(orderIdList, null, businessTime, shipmentState);
         }
 
@@ -1966,6 +1966,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                         orderSeaTimeEnum = OrderSeaTimeEnum.SEA_CLEARED;
                         break;
                     case UNLOADED:
+                        if (Objects.isNull(businessTime)){
+                            // 到仓业务时间为空时，不更新订单到仓动态
+                            return;
+                        }
                         orderSeaTimeEnum = OrderSeaTimeEnum.SEA_UNLOADED_CABINET;
                         break;
                 }
@@ -2002,6 +2006,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                         orderAirTimeEnum = OrderAirTimeEnum.AIR_ARRIVED;
                         break;
                     case TO_WAREHOUSED:
+                        if (Objects.isNull(businessTime)){
+                            // 到仓业务时间为空时，不在做订单到仓动态更新
+                            return;
+                        }
                         orderAirTimeEnum = OrderAirTimeEnum.AIR_UNLOADED_CABINET;
                         break;
                 }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxCabinetUnload/BoxCabinetUnloadServiceImpl.java

@@ -137,14 +137,14 @@ public class BoxCabinetUnloadServiceImpl extends AbstractService<BoxCabinetUnloa
                 //修改订单状态为已到仓
                 boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.UNLOADED_CABINET.getValue(),
                         OrderStatusMsgEnum.UNLOADED_CABINET.getInWarehouseState(),
-                        BoxAirStatusEnum.TO_WAREHOUSED.getStatus(), null, null, ulBoxTime, null, Integer.parseInt(boxDO.getTransportType()));
+                        BoxAirStatusEnum.TO_WAREHOUSED.getStatus(), null, null, null, null, Integer.parseInt(boxDO.getTransportType()));
 
                 boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.CABINET_WAREHOUSE, "");
             } else {
                 //修改订单状态为已卸柜
                 boxService.updateOrderStatusByShipmentIdAndTransportType(shipmentId, OrderStatusEnum.UNLOADED_CABINET.getValue(),
                         OrderStatusMsgEnum.UNLOADED_CABINET.getInWarehouseState(),
-                        BoxStatusEnum.UNLOADED.getStatus(), null, null, ulBoxTime, null, Integer.parseInt(boxDO.getTransportType()));
+                        BoxStatusEnum.UNLOADED.getStatus(), null, null, null, null, Integer.parseInt(boxDO.getTransportType()));
 
                 boxService.addOrderLogByShipmentId(shipmentId, OrderShipmentLog.CABINET_UNLOAD, "");
             }