Merge branch 'inquiry-zhengyi' into dev

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

@@ -2715,7 +2715,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     }
                 }
             }
-            if ((type == 6 || type == 10 || type == 12) && isPayAdvanceException) {
+            if ((type == 6 || type == 10 || (orderDO.getStatus() == 5 && type == 12)) && isPayAdvanceException) {
                 // TODO 待确定,订单之前处理过预付异常，这时入仓修改产生的新预付异常是否重复生成
                 List<OrderExceptionDO> orderExceptionDOList =
                         orderExceptionService.getOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderDO.getOrderId(),