Merge branch 'master' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master

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

@@ -4446,7 +4446,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             updateGuanlianOrderStatus(currentOrderDO);
         }
 
-        if (Objects.nonNull(abnormalState) && abnormalState == 0) {
+        // 2025-1-15 已退仓不需要重新计算价格
+        if (Objects.nonNull(abnormalState) && abnormalState == 0  && !Objects.equals(OrderStatusEnum.WITHDRAWN.getValue(), status)) {
             if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue()) || Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_SEA_COMBINED_TRANSPORT.getValue())) {
                 // 如果订单异常处理完成，则更新计价
                 handleException(orderId, currentOrderDO, 40);